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

Fixing a few things in the new test.

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-07-02 11:19:51 -07:00
parent cf747b14ec
commit 6f11da35a7
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
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/integration/runners/test_state.py
View file

@ -443,7 +443,7 @@ class OrchEventTest(ShellCase):
__reload_config=True).get('jid')
if jid is None:
raise Exception('jid missing from run_run_plus output')
raise salt.exceptions.SaltInvocationError('jid missing from run_run_plus output')
signal.signal(signal.SIGALRM, self.alarm_handler)
signal.alarm(self.timeout)
@ -453,7 +453,7 @@ class OrchEventTest(ShellCase):
event = listener.get_event(full=True)
if event is None:
continue
if event['tag'] == 'salt/run/{0}/ret'.format(jid):
if event.get('tag', '') == 'salt/run/{0}/ret'.format(jid):
received = True
# Don't wrap this in a try/except. We want to know if the
# data structure is different from what we expect!