removed redundant tests, adjusted makefile expected count

This commit is contained in:
Brian Coca 2015-10-02 20:06:22 -04:00
parent 4ba5ebd1c8
commit 5680a9fa32
2 changed files with 1 additions and 17 deletions

View file

@ -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" ]

View file

@ -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