From acac001742a42786db0ef1b2130deef5ab8e8fce Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Thu, 20 Sep 2018 13:38:54 -0500 Subject: [PATCH] Add number of skipped tasks to play recap in 'default' callback (#45797) --- lib/ansible/plugins/callback/default.py | 10 ++++++---- .../callback_default.out.default.stdout | 2 +- .../callback_default.out.failed_to_stderr.stdout | 2 +- .../callback_default.out.hide_ok.stdout | 2 +- .../callback_default.out.hide_skipped.stdout | 2 +- .../callback_default.out.hide_skipped_ok.stdout | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/ansible/plugins/callback/default.py b/lib/ansible/plugins/callback/default.py index f444a42d92b..c83ebbc0c5d 100644 --- a/lib/ansible/plugins/callback/default.py +++ b/lib/ansible/plugins/callback/default.py @@ -327,21 +327,23 @@ class CallbackModule(CallbackBase): for h in hosts: t = stats.summarize(h) - self._display.display(u"%s : %s %s %s %s" % ( + self._display.display(u"%s : %s %s %s %s %s" % ( hostcolor(h, t), colorize(u'ok', t['ok'], C.COLOR_OK), colorize(u'changed', t['changed'], C.COLOR_CHANGED), colorize(u'unreachable', t['unreachable'], C.COLOR_UNREACHABLE), - colorize(u'failed', t['failures'], C.COLOR_ERROR)), + colorize(u'failed', t['failures'], C.COLOR_ERROR), + colorize(u'skipped', t['skipped'], C.COLOR_SKIP)), screen_only=True ) - self._display.display(u"%s : %s %s %s %s" % ( + self._display.display(u"%s : %s %s %s %s %s" % ( hostcolor(h, t, False), colorize(u'ok', t['ok'], None), colorize(u'changed', t['changed'], None), colorize(u'unreachable', t['unreachable'], None), - colorize(u'failed', t['failures'], None)), + colorize(u'failed', t['failures'], None), + colorize(u'skipped', t['skipped'], None)), log_only=True ) diff --git a/test/integration/targets/callback_default/callback_default.out.default.stdout b/test/integration/targets/callback_default/callback_default.out.default.stdout index fe2068ada9b..38c1b975ffc 100644 --- a/test/integration/targets/callback_default/callback_default.out.default.stdout +++ b/test/integration/targets/callback_default/callback_default.out.default.stdout @@ -40,5 +40,5 @@ TASK [Second free task] ******************************************************** changed: [testhost] PLAY RECAP ********************************************************************* -testhost : ok=10 changed=7 unreachable=0 failed=0 +testhost : ok=10 changed=7 unreachable=0 failed=0 skipped=1 diff --git a/test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stdout b/test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stdout index 1489c702bce..ad29803e903 100644 --- a/test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stdout +++ b/test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stdout @@ -39,5 +39,5 @@ TASK [Second free task] ******************************************************** changed: [testhost] PLAY RECAP ********************************************************************* -testhost : ok=10 changed=7 unreachable=0 failed=0 +testhost : ok=10 changed=7 unreachable=0 failed=0 skipped=1 diff --git a/test/integration/targets/callback_default/callback_default.out.hide_ok.stdout b/test/integration/targets/callback_default/callback_default.out.hide_ok.stdout index 297662b94c6..48d6250f418 100644 --- a/test/integration/targets/callback_default/callback_default.out.hide_ok.stdout +++ b/test/integration/targets/callback_default/callback_default.out.hide_ok.stdout @@ -34,5 +34,5 @@ TASK [Second free task] ******************************************************** changed: [testhost] PLAY RECAP ********************************************************************* -testhost : ok=10 changed=7 unreachable=0 failed=0 +testhost : ok=10 changed=7 unreachable=0 failed=0 skipped=1 diff --git a/test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout b/test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout index 2b2c4dadfd9..462143d59b3 100644 --- a/test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout +++ b/test/integration/targets/callback_default/callback_default.out.hide_skipped.stdout @@ -37,5 +37,5 @@ TASK [Second free task] ******************************************************** changed: [testhost] PLAY RECAP ********************************************************************* -testhost : ok=10 changed=7 unreachable=0 failed=0 +testhost : ok=10 changed=7 unreachable=0 failed=0 skipped=1 diff --git a/test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout b/test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout index e50f95736e0..95d3407ddad 100644 --- a/test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout +++ b/test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stdout @@ -31,5 +31,5 @@ TASK [Second free task] ******************************************************** changed: [testhost] PLAY RECAP ********************************************************************* -testhost : ok=10 changed=7 unreachable=0 failed=0 +testhost : ok=10 changed=7 unreachable=0 failed=0 skipped=1