Ensure handlers run when meta tasks are defined and add handler integration tests

Fixes #6678
Fixes #6670
This commit is contained in:
James Tanner
2014-03-25 13:32:11 -04:00
parent 3eecc039b9
commit f9018a6f1d
7 changed files with 126 additions and 35 deletions

View File

@@ -14,7 +14,7 @@ else
CREDENTIALS_ARG =
endif
all: non_destructive destructive check_mode test_hash
all: non_destructive destructive check_mode test_hash test_handlers
non_destructive:
ansible-playbook non_destructive.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
@@ -25,6 +25,9 @@ destructive:
check_mode:
ansible-playbook check_mode.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v --check $(TEST_FLAGS)
test_handlers:
ansible-playbook test_handlers.yml -i inventory.handlers -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
test_hash:
ANSIBLE_HASH_BEHAVIOUR=replace ansible-playbook test_hash.yml -i $(INVENTORY) $(CREDENTIALS_ARG) -v -e '{"test_hash":{"extra_args":"this is an extra arg"}}'
ANSIBLE_HASH_BEHAVIOUR=merge ansible-playbook test_hash.yml -i $(INVENTORY) $(CREDENTIALS_ARG) -v -e '{"test_hash":{"extra_args":"this is an extra arg"}}'