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

Updating tests for watch_any_fail and require_any_fail.

Browse source
This commit is contained in:
Gareth J. Greenaway 2017-11-07 09:24:59 -07:00
parent 4dbd3e5567
commit 7cdf703884
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 12 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/integration/files/file/base/requisites/require_any_fail.sls
View file

@ -1,11 +1,4 @@
# A should fail since both E & F fail
D:
cmd.run:
- name: echo D
- require_any:
- cmd: E
- cmd: F
# D should fail since both E & F fail
E:
cmd.run:
- name: 'false'
@ -13,3 +6,10 @@ E:
F:
cmd.run:
- name: 'false'
D:
cmd.run:
- name: echo D
- require_any:
- cmd: E
- cmd: F

46
tests/integration/modules/test_state.py
View file

@ -745,30 +745,11 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
Ensure that some of them are failing and that the order is right.
'''
expected_result = {
'cmd_|-D_|-echo D_|-run': {
'__run_num__': 2,
'comment': 'One or more requisite failed: requisites.require_any_fail.F, requisites.require_any_fail.E',
'result': False,
'changes': False,
},
'cmd_|-E_|-false_|-run': {
'__run_num__': 0,
'comment': 'Command "false" run',
'result': False,
'changes': True,
},
'cmd_|-F_|-false_|-run': {
'__run_num__': 1,
'comment': 'Command "false" run',
'result': False,
'changes': True,
},
}
ret = self.run_function('state.sls', mods='requisites.require_any_fail')
result = self.normalize_ret(ret)
self.assertReturnNonEmptySaltType(ret)
self.assertEqual(expected_result, result)
self.assertIn('One or more requisite failed',
result['cmd_|-D_|-echo D_|-run']['comment'])
def test_requisites_watch_any(self):
'''
@ -837,30 +818,11 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
Ensure that some of them are failing and that the order is right.
'''
expected_result = {
'cmd_|-A_|-true_|-wait': {
'__run_num__': 2,
'comment': 'One or more requisite failed: requisites.watch_any_fail.B, requisites.watch_any_fail.C',
'result': False,
'changes': False,
},
'cmd_|-B_|-false_|-run': {
'__run_num__': 0,
'comment': 'Command "false" run',
'result': False,
'changes': True,
},
'cmd_|-C_|-false_|-run': {
'__run_num__': 1,
'comment': 'Command "false" run',
'result': False,
'changes': True,
},
}
ret = self.run_function('state.sls', mods='requisites.watch_any_fail')
result = self.normalize_ret(ret)
self.assertReturnNonEmptySaltType(ret)
self.assertEqual(expected_result, result)
self.assertIn('One or more requisite failed',
result['cmd_|-A_|-true_|-wait']['comment'])
def test_requisites_onchanges_any(self):
'''