Detect failure in always block after rescue (#70094)
* Detect failure in always block after rescue Fixes #70000 ci_complete * Add more tests
This commit is contained in:
parent
33e25504ac
commit
0ed5b77377
5 changed files with 77 additions and 1 deletions
|
@ -489,7 +489,7 @@ class PlayIterator:
|
|||
elif state.run_state == self.ITERATING_ALWAYS and state.fail_state & self.FAILED_ALWAYS == 0:
|
||||
return False
|
||||
else:
|
||||
return not state.did_rescue
|
||||
return not (state.did_rescue and state.fail_state & self.FAILED_ALWAYS == 0)
|
||||
elif state.run_state == self.ITERATING_TASKS and self._check_failed_state(state.tasks_child_state):
|
||||
cur_block = self._blocks[state.cur_block]
|
||||
if len(cur_block.rescue) > 0 and state.fail_state & self.FAILED_RESCUE == 0:
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
- hosts: localhost
|
||||
gather_facts: no
|
||||
tasks:
|
||||
- block:
|
||||
- name: EXPECTED FAILURE
|
||||
fail:
|
||||
msg: Failure in block
|
||||
always:
|
||||
- name: EXPECTED FAILURE
|
||||
fail:
|
||||
msg: Failure in always
|
||||
- debug:
|
||||
msg: DID NOT RUN
|
|
@ -0,0 +1,16 @@
|
|||
- hosts: localhost
|
||||
gather_facts: no
|
||||
tasks:
|
||||
- block:
|
||||
- name: EXPECTED FAILURE
|
||||
fail:
|
||||
msg: Failure in block
|
||||
rescue:
|
||||
- debug:
|
||||
msg: Rescue
|
||||
always:
|
||||
- name: EXPECTED FAILURE
|
||||
fail:
|
||||
msg: Failure in always
|
||||
- debug:
|
||||
msg: DID NOT RUN
|
12
test/integration/targets/blocks/always_no_rescue_rc.yml
Normal file
12
test/integration/targets/blocks/always_no_rescue_rc.yml
Normal file
|
@ -0,0 +1,12 @@
|
|||
- hosts: localhost
|
||||
gather_facts: no
|
||||
tasks:
|
||||
- block:
|
||||
- name: EXPECTED FAILURE
|
||||
fail:
|
||||
msg: Failure in block
|
||||
always:
|
||||
- debug:
|
||||
msg: Always
|
||||
- debug:
|
||||
msg: DID NOT RUN
|
|
@ -39,3 +39,38 @@ env python -c \
|
|||
[ "$(grep -c 'TEST COMPLETE' block_test.out)" = "$(grep -E '^[0-9]+ plays in' block_test_wo_colors.out | cut -f1 -d' ')" ]
|
||||
|
||||
ansible-playbook -vv block_rescue_vars.yml
|
||||
|
||||
# https://github.com/ansible/ansible/issues/70000
|
||||
set +e
|
||||
exit_code=0
|
||||
ansible-playbook -vv always_failure_with_rescue_rc.yml > rc_test.out || exit_code=$?
|
||||
set -e
|
||||
cat rc_test.out
|
||||
[ $exit_code -eq 2 ]
|
||||
[ "$(grep -c 'Failure in block' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'Rescue' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'Failure in always' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'DID NOT RUN' rc_test.out )" -eq 0 ]
|
||||
rm -f rc_test_out
|
||||
|
||||
set +e
|
||||
exit_code=0
|
||||
ansible-playbook -vv always_no_rescue_rc.yml > rc_test.out || exit_code=$?
|
||||
set -e
|
||||
cat rc_test.out
|
||||
[ $exit_code -eq 2 ]
|
||||
[ "$(grep -c 'Failure in block' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'Always' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'DID NOT RUN' rc_test.out )" -eq 0 ]
|
||||
rm -f rc_test.out
|
||||
|
||||
set +e
|
||||
exit_code=0
|
||||
ansible-playbook -vv always_failure_no_rescue_rc.yml > rc_test.out || exit_code=$?
|
||||
set -e
|
||||
cat rc_test.out
|
||||
[ $exit_code -eq 2 ]
|
||||
[ "$(grep -c 'Failure in block' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'Failure in always' rc_test.out )" -eq 1 ]
|
||||
[ "$(grep -c 'DID NOT RUN' rc_test.out )" -eq 0 ]
|
||||
rm -f rc_test.out
|
||||
|
|
Loading…
Reference in a new issue