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 reactor ping test

Browse source
This commit is contained in:
Daniel A. Wozniak 2019-02-19 18:34:28 +00:00
parent 86adb6b0fe
commit 927219ca9c
No known key found for this signature in database
GPG key ID: 166B9D2C06C82D61
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/support/mixins.py
View file

@ -665,16 +665,19 @@ def _fetch_events(q):
queue_item.task_done()
atexit.register(_clean_queue)
opts = RUNTIME_VARS.RUNTIME_CONFIGS['minion']
event = salt.utils.event.get_event('minion', sock_dir=opts['sock_dir'], opts=opts)
a_config = AdaptedConfigurationTestCaseMixin()
event = salt.utils.event.get_event(
'minion',
sock_dir=a_config.get_config('minion')['sock_dir'],
opts=a_config.get_config('minion'),
)
while True:
try:
events = event.get_event(full=False)
except Exception:
except Exception as exc:
# This is broad but we'll see all kinds of issues right now
# if we drop the proc out from under the socket while we're reading
pass
log.exception("Exception caught while getting events %r", exc)
q.put(events)