From 5bcb715dc067195f4d1c84e2bdc88c628e127488 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Sat, 26 Jul 2014 01:39:22 -0500 Subject: [PATCH] Fixing up previous include test --- .../roles/test_bad_parsing/meta/main.yml | 3 --- .../roles/test_good_parsing/meta/main.yml | 3 --- .../roles/test_good_parsing/tasks/main.yml | 16 +--------------- .../test_good_parsing/tasks/test_include.yml | 1 + 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 test/integration/roles/test_bad_parsing/meta/main.yml delete mode 100644 test/integration/roles/test_good_parsing/meta/main.yml create mode 100644 test/integration/roles/test_good_parsing/tasks/test_include.yml diff --git a/test/integration/roles/test_bad_parsing/meta/main.yml b/test/integration/roles/test_bad_parsing/meta/main.yml deleted file mode 100644 index a8b63dfdf2..0000000000 --- a/test/integration/roles/test_bad_parsing/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: - - prepare_tests - diff --git a/test/integration/roles/test_good_parsing/meta/main.yml b/test/integration/roles/test_good_parsing/meta/main.yml deleted file mode 100644 index 1050c23ce3..0000000000 --- a/test/integration/roles/test_good_parsing/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: - - prepare_tests - diff --git a/test/integration/roles/test_good_parsing/tasks/main.yml b/test/integration/roles/test_good_parsing/tasks/main.yml index 09532dad4b..e61a52cf19 100644 --- a/test/integration/roles/test_good_parsing/tasks/main.yml +++ b/test/integration/roles/test_good_parsing/tasks/main.yml @@ -117,21 +117,7 @@ # command shouldn't end in spaces, amend test once fixed - result.cmd == "echo foo --arg=a --arg=b" -- name: create a test file to include - copy: 'dest={{ output_dir }}/test_include.yml content="- debug: var=param\n"' - register: result - -- name: assert that the test include file was created - assert: - that: - - result.changed - - name: test includes with params - include: "{{ output_dir }}/test_include.yml param={{ test_input }}" + include: test_include.yml param={{ test_input }} register: result -- debug: var=result - -- assert: - that: - - 'result.dest == "{{ output_dir|expanduser }}/test_include.yml"' diff --git a/test/integration/roles/test_good_parsing/tasks/test_include.yml b/test/integration/roles/test_good_parsing/tasks/test_include.yml new file mode 100644 index 0000000000..2526f45b2b --- /dev/null +++ b/test/integration/roles/test_good_parsing/tasks/test_include.yml @@ -0,0 +1 @@ +- debug: var=param