internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename argument msg to fail msg

Browse Source 
This change make the arguments of assert less ambiguous.
This commit is contained in:
zhikangzhang
2018-06-14 13:35:15 -04:00
committed by Zhikang Zhang
parent 065d9ed6ac
commit 2333b4474c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ansible/plugins/action/assert.py
View File

@@ -38,10 +38,13 @@ class ActionModule(ActionBase):
if 'that' not in self._task.args:
raise AnsibleError('conditional required in "that" string')
msg = None
fail_msg = None
success_msg = None
if 'msg' in self._task.args and isinstance(self._task.args['msg'], string_types):
msg = self._task.args['msg']
if 'fail_msg' in self._task.args and isinstance(self._task.args['fail_msg'], string_types):
fail_msg = self._task.args['fail_msg']
elif 'msg' in self._task.args and isinstance(self._task.args['msg'], string_types):
fail_msg = self._task.args['msg']
if 'success_msg' in self._task.args and isinstance(self._task.args['success_msg'], string_types):
success_msg = self._task.args['success_msg']
@@ -65,8 +68,8 @@ class ActionModule(ActionBase):
result['evaluated_to'] = test_result
result['assertion'] = that
if msg:
result['msg'] = msg
if fail_msg:
result['msg'] = fail_msg
return result