valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #46413 from meaksh/2017.7-explore-result-in-depth

Browse Source 
Explore 'module.run' state module output in depth to catch "result" properly
This commit is contained in:
Nicole Thomas 2018-03-12 14:49:06 -04:00 committed by GitHub
commit b7191b8782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/states/module.py
View File

@ -530,7 +530,25 @@ def _get_result(func_ret, changes):
res = changes_ret.get('result', {})
elif changes_ret.get('retcode', 0) != 0:
res = False
# Explore dict in depth to determine if there is a
# 'result' key set to False which sets the global
# state result.
else:
res = _get_dict_result(changes_ret)
return res
def _get_dict_result(node):
ret = True
for key, val in six.iteritems(node):
if key == 'result' and val is False:
ret = False
break
elif isinstance(val, dict):
ret = _get_dict_result(val)
if ret is False:
break
return ret
mod_watch = salt.utils.alias_function(run, 'mod_watch')

62
tests/unit/states/test_module.py
View File

@ -25,6 +25,57 @@ log = logging.getLogger(__name__)
CMD = 'foo.bar'
STATE_APPLY_RET = {
'module_|-test2_|-state.apply_|-run': {
'comment': 'Module function state.apply executed',
'name': 'state.apply',
'start_time': '16:11:48.818932',
'result': False,
'duration': 179.439,
'__run_num__': 0,
'changes': {
'ret': {
'module_|-test3_|-state.apply_|-run': {
'comment': 'Module function state.apply executed',
'name': 'state.apply',
'start_time': '16:11:48.904796',
'result': True,
'duration': 89.522,
'__run_num__': 0,
'changes': {
'ret': {
'module_|-test4_|-cmd.run_|-run': {
'comment': 'Module function cmd.run executed',
'name': 'cmd.run',
'start_time': '16:11:48.988574',
'result': True,
'duration': 4.543,
'__run_num__': 0,
'changes': {
'ret': 'Wed Mar 7 16:11:48 CET 2018'
},
'__id__': 'test4'
}
}
},
'__id__': 'test3'
},
'module_|-test3_fail_|-test3_fail_|-run': {
'comment': 'Module function test3_fail is not available',
'name': 'test3_fail',
'start_time': '16:11:48.994607',
'result': False,
'duration': 0.466,
'__run_num__': 1,
'changes': {},
'__id__': 'test3_fail'
}
}
},
'__id__': 'test2'
}
}
def _mocked_func_named(name, names=('Fred', 'Swen',)):
'''
@ -143,6 +194,17 @@ class ModuleStateTest(TestCase, LoaderModuleMockMixin):
if ret['comment'] != '{0}: Success'.format(CMD) or not ret['result']:
self.fail('module.run failed: {0}'.format(ret))
def test_run_state_apply_result_false(self):
'''
Tests the 'result' of module.run that calls state.apply execution module
:return:
'''
with patch.dict(module.__salt__, {"state.apply": MagicMock(return_value=STATE_APPLY_RET)}):
with patch.dict(module.__opts__, {'use_deprecated': ['module.run']}):
ret = module.run(**{"name": "state.apply", 'mods': 'test2'})
if ret['result']:
self.fail('module.run did not report false result: {0}'.format(ret))
def test_run_unexpected_keywords(self):
with patch.dict(module.__salt__, {CMD: _mocked_func_args}):
with patch.dict(module.__opts__, {'use_superseded': ['module.run']}):