saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix race condition in integration test startup

Browse source
This commit is contained in:
Thomas Jackson 2015-04-04 15:20:52 -07:00
parent dfd606a365
commit d21e180a5a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/__init__.py
View file

@ -61,6 +61,7 @@ import salt.utils.process
from salt.utils import fopen, get_colors
from salt.utils.verify import verify_env
from salt.utils.immutabletypes import freeze
from salt.exceptions import SaltClientError
try:
import salt.master
@ -868,9 +869,14 @@ class TestDaemon(object):
)
sys.stdout.flush()
responses = self.client.cmd(
list(expected_connections), 'test.ping', expr_form='list',
)
try:
responses = self.client.cmd(
list(expected_connections), 'test.ping', expr_form='list',
)
# we'll get this exception if the master process hasn't finished starting yet
except SaltClientError:
time.sleep(0.1)
continue
for target in responses:
if target not in expected_connections:
# Someone(minion) else "listening"?