From b95286c88e3e8636ecd697cc41b55dcf7fbeb026 Mon Sep 17 00:00:00 2001 From: nitzmahone Date: Fri, 18 Mar 2016 10:13:45 -0700 Subject: [PATCH] re-integrate test_test_infra output checking added secondary run with overridden inventory/test args per bcoca request --- test/integration/Makefile | 6 ++++-- test/integration/inventory.local | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 test/integration/inventory.local diff --git a/test/integration/Makefile b/test/integration/Makefile index b02592eaf2..48382cd4c4 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -26,8 +26,10 @@ EUID := $(shell id -u -r) all: setup test_test_infra parsing test_var_precedence unicode test_templating_settings environment non_destructive destructive includes blocks pull check_mode test_hash test_handlers test_group_by test_vault test_tags test_lookup_paths no_log test_connection test_gathering_facts test_test_infra: - # ensure fail/assert work and can stop execution with non-zero exit code - PB_OUT=$$(ansible-playbook -i $(INVENTORY) test_test_infra.yml -e @$(VARS_FILE) $(CREDENTIALS_ARG) $(TEST_FLAGS)) ; APB_RC=$$? ; echo "$$PB_OUT" ; echo "rc was $$APB_RC (must be non-zero)" ; [ $$APB_RC -ne 0 ] + # ensure fail/assert work locally and can stop execution with non-zero exit code + PB_OUT=$$(ansible-playbook -i inventory.local test_test_infra.yml) ; APB_RC=$$? ; echo "$$PB_OUT" ; echo "rc was $$APB_RC (must be non-zero)" ; [ $$APB_RC -ne 0 ] ; echo "ensure playbook output shows assert/fail works (True)" ; echo "$$PB_OUT" | grep "fail works (True)" || exit 1 ; echo "$$PB_OUT" | fgrep "assert works (True)" || exit 1 + # ensure we work using all specified test args, overridden inventory, etc + PB_OUT=$$(ansible-playbook -i $(INVENTORY) test_test_infra.yml -e @$(VARS_FILE) $(CREDENTIALS_ARG) $(TEST_FLAGS)) ; APB_RC=$$? ; echo "$$PB_OUT" ; echo "rc was $$APB_RC (must be non-zero)" ; [ $$APB_RC -ne 0 ] ; echo "ensure playbook output shows assert/fail works (True)" ; echo "$$PB_OUT" | grep "fail works (True)" || exit 1 ; echo "$$PB_OUT" | fgrep "assert works (True)" || exit 1 setup: rm -rf $(TEST_DIR) diff --git a/test/integration/inventory.local b/test/integration/inventory.local new file mode 100644 index 0000000000..2baa1f88fb --- /dev/null +++ b/test/integration/inventory.local @@ -0,0 +1,2 @@ +testhost ansible_connection=local +