archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix label lookup in the default callback for includes (#68822)

Browse Source 
* Replace included_file._args w/ included_file._vars

* Fix item value in output of include_tasks loop

Signed-off-by: Yadnyawalk Tale <ytale@redhat.com>

* Update tests for loop callback fix. Add changelog

Co-authored-by: Yadnyawalk Tale <ytale@redhat.com>

Fixes #65904
Fixes #66018
pull/68828/head
Matt Martz 5 years ago committed by GitHub
parent a681810b2f
commit d86d20a378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
changelogs/fragments/65904-fix-loop-label.yml
Unescape Escape View File

@ -0,0 +1,2 @@
bugfixes:
- Fix label lookup in the default callback for includes (https://github.com/ansible/ansible/issues/65904)

5
lib/ansible/plugins/callback/default.py
Unescape Escape View File

@ -350,8 +350,9 @@ class CallbackModule(CallbackBase):
def v2_playbook_on_include(self, included_file):
msg = 'included: %s for %s' % (included_file._filename, ", ".join([h.name for h in included_file._hosts]))
if 'item' in included_file._args:
msg += " => (item=%s)" % (self._get_item_label(included_file._args),)
label = self._get_item_label(included_file._vars)
if label:
msg += " => (item=%s)" % label
self._display.display(msg, color=C.COLOR_SKIP)
def v2_playbook_on_stats(self, stats):

10
test/integration/targets/callback_default/callback_default.out.default.stdout
Unescape Escape View File

@ -42,6 +42,14 @@ fatal: [testhost]: FAILED! => {"changed": false, "msg": "Failed as requested fro
TASK [Rescue task] *************************************************************
changed: [testhost]
TASK [include_tasks] ***********************************************************
included: .../test/integration/targets/callback_default/include_me.yml for testhost => (item=1)
TASK [debug] *******************************************************************
ok: [testhost] => {
"item": 1
}
RUNNING HANDLER [Test handler 1] ***********************************************
changed: [testhost]
@ -60,5 +68,5 @@ TASK [Second free task] ********************************************************
changed: [testhost]
PLAY RECAP *********************************************************************
testhost : ok=12 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2
testhost : ok=14 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2

10
test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stdout
Unescape Escape View File

@ -39,6 +39,14 @@ TASK [EXPECTED FAILURE Failed task to be rescued] ******************************
TASK [Rescue task] *************************************************************
changed: [testhost]
TASK [include_tasks] ***********************************************************
included: .../test/integration/targets/callback_default/include_me.yml for testhost => (item=1)
TASK [debug] *******************************************************************
ok: [testhost] => {
"item": 1
}
RUNNING HANDLER [Test handler 1] ***********************************************
changed: [testhost]
@ -57,5 +65,5 @@ TASK [Second free task] ********************************************************
changed: [testhost]
PLAY RECAP *********************************************************************
testhost : ok=12 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2
testhost : ok=14 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2

3
test/integration/targets/callback_default/callback_default.out.hide_ok.stdout
Unescape Escape View File

@ -35,6 +35,7 @@ fatal: [testhost]: FAILED! => {"changed": false, "msg": "Failed as requested fro
TASK [Rescue task] *************************************************************
changed: [testhost]
included: .../test/integration/targets/callback_default/include_me.yml for testhost => (item=1)
RUNNING HANDLER [Test handler 1] ***********************************************
changed: [testhost]
@ -51,5 +52,5 @@ TASK [Second free task] ********************************************************
changed: [testhost]
PLAY RECAP *********************************************************************
testhost : ok=12 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2
testhost : ok=14 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2

8
test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout
Unescape Escape View File

@ -37,6 +37,12 @@ fatal: [testhost]: FAILED! => {"changed": false, "msg": "Failed as requested fro
TASK [Rescue task] *************************************************************
changed: [testhost]
included: .../test/integration/targets/callback_default/include_me.yml for testhost => (item=1)
TASK [debug] *******************************************************************
ok: [testhost] => {
"item": 1
}
RUNNING HANDLER [Test handler 1] ***********************************************
changed: [testhost]
@ -56,5 +62,5 @@ TASK [Second free task] ********************************************************
changed: [testhost]
PLAY RECAP *********************************************************************
testhost : ok=12 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2
testhost : ok=14 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2

3
test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout
Unescape Escape View File

@ -31,6 +31,7 @@ fatal: [testhost]: FAILED! => {"changed": false, "msg": "Failed as requested fro
TASK [Rescue task] *************************************************************
changed: [testhost]
included: .../test/integration/targets/callback_default/include_me.yml for testhost => (item=1)
RUNNING HANDLER [Test handler 1] ***********************************************
changed: [testhost]
@ -47,5 +48,5 @@ TASK [Second free task] ********************************************************
changed: [testhost]
PLAY RECAP *********************************************************************
testhost : ok=12 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2
testhost : ok=14 changed=9 unreachable=0 failed=0 skipped=1 rescued=1 ignored=2

2
test/integration/targets/callback_default/include_me.yml
Unescape Escape View File

@ -0,0 +1,2 @@
- debug:
var: item

2
test/integration/targets/callback_default/runme.sh
Unescape Escape View File

@ -23,6 +23,7 @@ run_test() {
2> >(set +x; tee "${OUTFILE}.${testname}.stderr" >&2)
# Scrub deprication warning that shows up in Python 2.6 on CentOS 6
sed -i -e '/RandomPool_DeprecationWarning/d' "${OUTFILE}.${testname}.stderr"
sed -i -e 's/included: .*\/test\/integration/included: ...\/test\/integration/g' "${OUTFILE}.${testname}.stdout"
diff -u "${ORIGFILE}.${testname}.stdout" "${OUTFILE}.${testname}.stdout" || diff_failure
diff -u "${ORIGFILE}.${testname}.stderr" "${OUTFILE}.${testname}.stderr" || diff_failure
@ -143,6 +144,7 @@ run_test failed_to_stderr
export ANSIBLE_DISPLAY_SKIPPED_HOSTS=1
export ANSIBLE_DISPLAY_OK_HOSTS=1
export ANSIBLE_DISPLAY_FAILED_STDERR=1
export ANSIBLE_TIMEOUT=1
# Check if UNREACHBLE is available in stderr
set +e

4
test/integration/targets/callback_default/test.yml
Unescape Escape View File

@ -57,6 +57,10 @@
- name: Rescue task
command: echo rescued
- include_tasks: include_me.yml
loop:
- 1
handlers:
- name: Test handler 1
command: echo foo

Write Preview
Loading…
Cancel
Save