From 7af2632c87b97c60307f956815cd09bc3cd46b90 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 21 May 2015 11:56:58 -0700 Subject: [PATCH] Forgot to invoke wrapper instead of SimpleHttpServer --- test/integration/Makefile | 3 +++ test/integration/roles/test_uri/tasks/main.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration/Makefile b/test/integration/Makefile index 923a29bc9fe..513b3b2311a 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -42,6 +42,9 @@ unicode: test_templating_settings: ansible-playbook test_templating_settings.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) +mine: + ansible-playbook mine.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) + non_destructive: ansible-playbook non_destructive.yml -i $(INVENTORY) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS) diff --git a/test/integration/roles/test_uri/tasks/main.yml b/test/integration/roles/test_uri/tasks/main.yml index b6fc5094cb9..66e01ae8e53 100644 --- a/test/integration/roles/test_uri/tasks/main.yml +++ b/test/integration/roles/test_uri/tasks/main.yml @@ -46,7 +46,7 @@ register: py2 - name: start SimpleHTTPServer - shell: cd {{ files_dir }} && {{ py2.stdout }} -m SimpleHTTPServer {{ http_port }} + shell: cd {{ files_dir }} && {{ py2.stdout }} {{ output_dir}}/testserver.py {{ http_port }} async: 60 # this test set takes ~15 seconds to run poll: 0