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

Fix incorrect msg in the results dict in loops (#71482)

Browse source
This commit is contained in:
Martin Krizek 2020-08-27 21:49:53 +02:00 committed by GitHub
parent a1a624b150
commit 50f221c63e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/fix-incorrect-msg-in-loops-results.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- Fix incorrect msg in the results dict in loops

2
lib/ansible/executor/task_executor.py
View file

@ -145,7 +145,7 @@ class TaskExecutor:
res[array] = res[array] + item[array]
del item[array]
if not res.get('Failed', False):
if not res.get('failed', False):
res['msg'] = 'All items completed'
else:
res = dict(changed=False, skipped=True, skipped_reason='No items in the list', results=[])

2
test/integration/targets/callback_default/callback_default.out.default.stdout
View file

@ -33,7 +33,7 @@ ok: [testhost] => (item=debug-3) => {
"msg": "debug-3"
}
skipping: [testhost] => (item=debug-4)
fatal: [testhost]: FAILED! => {"msg": "All items completed"}
fatal: [testhost]: FAILED! => {"msg": "One or more items failed"}
...ignoring
TASK [EXPECTED FAILURE Failed task to be rescued] ******************************

2
test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stderr
View file

@ -1,5 +1,5 @@
+ ansible-playbook -i inventory test.yml
++ set +x
fatal: [testhost]: FAILED! => {"changed": false, "msg": "no reason"}
fatal: [testhost]: FAILED! => {"msg": "All items completed"}
fatal: [testhost]: FAILED! => {"msg": "One or more items failed"}
fatal: [testhost]: FAILED! => {"changed": false, "msg": "Failed as requested from task"}

2
test/integration/targets/callback_default/callback_default.out.hide_ok.stdout
View file

@ -27,7 +27,7 @@ failed: [testhost] (item=debug-2) => {
"msg": "debug-2"
}
skipping: [testhost] => (item=debug-4)
fatal: [testhost]: FAILED! => {"msg": "All items completed"}
fatal: [testhost]: FAILED! => {"msg": "One or more items failed"}
...ignoring
TASK [EXPECTED FAILURE Failed task to be rescued] ******************************

2
test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout
View file

@ -29,7 +29,7 @@ failed: [testhost] (item=debug-2) => {
ok: [testhost] => (item=debug-3) => {
"msg": "debug-3"
}
fatal: [testhost]: FAILED! => {"msg": "All items completed"}
fatal: [testhost]: FAILED! => {"msg": "One or more items failed"}
...ignoring
TASK [EXPECTED FAILURE Failed task to be rescued] ******************************

2
test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout
View file

@ -23,7 +23,7 @@ changed: [testhost] => (item=debug-1) => {
failed: [testhost] (item=debug-2) => {
"msg": "debug-2"
}
fatal: [testhost]: FAILED! => {"msg": "All items completed"}
fatal: [testhost]: FAILED! => {"msg": "One or more items failed"}
...ignoring
TASK [EXPECTED FAILURE Failed task to be rescued] ******************************