From 5680a9fa3291a5d0f0f82a1e01b980e0868620e7 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 2 Oct 2015 20:06:22 -0400 Subject: [PATCH] removed redundant tests, adjusted makefile expected count --- test/integration/Makefile | 2 +- test/integration/no_log_local.yml | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/test/integration/Makefile b/test/integration/Makefile index ab3262d01a1..fe46dd9d2e6 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -193,5 +193,5 @@ test_lookup_paths: no_log: # This test expects 7 loggable vars and 0 non loggable ones, if either mismatches it fails, run the ansible-playbook command to debug - [ "$$(ansible-playbook no_log_local.yml -i $(INVENTORY) -vvvvv | awk -e 'BEGIN { logme = 0; nolog = 0; } /LOG_ME/ { logme += 1;} /DO_NOT_LOG/ { nolog += 1;} END { printf "%d/%d", logme, nolog; }')" = "7/0" ] + [ "$$(ansible-playbook no_log_local.yml -i $(INVENTORY) -vvvvv | awk -e 'BEGIN { logme = 0; nolog = 0; } /LOG_ME/ { logme += 1;} /DO_NOT_LOG/ { nolog += 1;} END { printf "%d/%d", logme, nolog; }')" = "6/0" ] diff --git a/test/integration/no_log_local.yml b/test/integration/no_log_local.yml index d68dc03a4cb..87d76ff0821 100644 --- a/test/integration/no_log_local.yml +++ b/test/integration/no_log_local.yml @@ -7,10 +7,6 @@ - name: args should be logged in the absence of no_log shell: echo "LOG_ME_TASK_SUCCEEDED" - - name: item args/results should be logged in the absence of no_log - shell: echo {{ item }} - with_items: [ "LOG_ME_ITEM_SUCCEEDED" ] - - name: failed args should be logged in the absence of no_log shell: echo "LOG_ME_TASK_FAILED" failed_when: true @@ -27,24 +23,12 @@ shell: echo "DO_NOT_LOG_TASK_SUCCEEDED" no_log: true - - name: item args should be suppressed with no_log - shell: echo {{ item }} - no_log: true - with_items: [ "DO_NOT_LOG_ITEM_SUCCEEDED" ] - - name: failed args should not be logged when task-level no_log set shell: echo "DO_NOT_LOG_TASK_FAILED" no_log: true failed_when: true ignore_errors: true - - name: failed item args should be suppressed with no_log - shell: echo {{ item }} - no_log: true - with_items: [ "DO_NOT_LOG_ITEM_FAILED" ] - failed_when: true - ignore_errors: true - - name: skipped task args should be suppressed with no_log shell: echo "DO_NOT_LOG_TASK_SKIPPED" no_log: true