From a8d52e3e940543300ad15e80de8d8b70b2e45a24 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 21 May 2015 12:24:41 -0700 Subject: [PATCH] Have to setup the proper mime-types before importing SImpleHttpServer --- test/integration/Makefile | 3 --- test/integration/roles/test_uri/files/testserver.py | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/integration/Makefile b/test/integration/Makefile index 513b3b2311..923a29bc9f 100644 --- a/test/integration/Makefile +++ b/test/integration/Makefile @@ -42,9 +42,6 @@ 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/files/testserver.py b/test/integration/roles/test_uri/files/testserver.py index 03cbfec507..d0d24a0050 100644 --- a/test/integration/roles/test_uri/files/testserver.py +++ b/test/integration/roles/test_uri/files/testserver.py @@ -1,6 +1,7 @@ import mimetypes -import SimpleHTTPServer if __name__ == '__main__': + mimetypes.init() mimetypes.add_type('application/json', '.json') + import SimpleHTTPServer SimpleHTTPServer.test()