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 timeout logic

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-04-18 22:50:37 +00:00 • committed by Pedro Algarvio
parent 517650f87b
commit 5fee7620a5
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/support/mixins.py
View file

@ -712,7 +712,7 @@ class SaltMinionEventAssertsMixin(object):
event = self.q.get(False)
except Empty:
time.sleep(sleep_time)
if start - time.time() >= timeout:
if time.time() - start >= timeout:
break
continue
if isinstance(event, dict):
@ -720,7 +720,7 @@ class SaltMinionEventAssertsMixin(object):
if desired_event == event:
self.fetch_proc.terminate()
return True
if start - time.time() >= timeout:
if time.time() - start >= timeout:
break
self.fetch_proc.terminate()
raise AssertionError('Event {0} was not received by minion'.format(desired_event))