Merge remote-tracking branch 'ansible-stage/new_arg_splitting' into new_arg_splitting

pull/8256/merge
James Cammarata 10 years ago
commit f0859a6d80

@ -22,6 +22,7 @@ parsing:
ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario1; [ $$? -eq 3 ] ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario1; [ $$? -eq 3 ]
ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario2; [ $$? -eq 3 ] ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario2; [ $$? -eq 3 ]
ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario3; [ $$? -eq 3 ] ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario3; [ $$? -eq 3 ]
ansible-playbook bad_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -vvv $(TEST_FLAGS) --tags common,scenario4; [ $$? -eq 3 ]
ansible-playbook good_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) ansible-playbook good_parsing.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
non_destructive: non_destructive:

@ -20,8 +20,9 @@
# otherwise ansible stops at the first one and we want to ensure STOP conditions for each # otherwise ansible stops at the first one and we want to ensure STOP conditions for each
- set_fact: - set_fact:
test_file: "./ansible_test_file" # FIXME, use set tempdir test_file: "{{ output_dir }}/ansible_test_file" # FIXME, use set tempdir
test_input: "owner=test" test_input: "owner=test"
bad_var: "{{ output_dir }}' owner=test"
chdir: "mom chdir=/tmp" chdir: "mom chdir=/tmp"
tags: common tags: common
@ -43,3 +44,10 @@
failed_when: False failed_when: False
tags: scenario3 tags: scenario3
- name: test that we can't go all Little Bobby Droptables on a quoted var to add more
file: "name={{ bad_var }}"
failed_when: False
tags: scenario4

Loading…
Cancel
Save