cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ISSUE 25470 - update patch from review details

Browse source
This commit is contained in:
James Hogarth 2017-08-04 21:38:42 +01:00 committed by Toshio Kuratomi
parent fc274bda8a
commit 7ec34b4cb2
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/callback/junit.py
View file

@ -132,7 +132,7 @@ class CallbackModule(CallbackBase):
task_data = self._task_data[task_uuid] task_data = self._task_data[task_uuid]
if self._fail_on_change == 'true' and status == 'changed': if self._fail_on_change == 'true' and status == 'ok' and result._result.get('changed', False):
status = 'failed' status = 'failed'
if status == 'failed' and 'EXPECTED FAILURE' in task_data.name: if status == 'failed' and 'EXPECTED FAILURE' in task_data.name:
@ -230,10 +230,7 @@ class CallbackModule(CallbackBase):
self._finish_task('failed', result) self._finish_task('failed', result)
def v2_runner_on_ok(self, result): def v2_runner_on_ok(self, result):
if result._result.get('changed', False): self._finish_task('ok', result)
self._finish_task('changed', result)
else:
self._finish_task('ok', result)
def v2_runner_on_skipped(self, result): def v2_runner_on_skipped(self, result):
self._finish_task('skipped', result) self._finish_task('skipped', result)