From 2395042fbed93d38ead80ccd7d9d0fc3133b40ff Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Fri, 13 Mar 2020 14:50:28 -0700 Subject: [PATCH 1/2] Removing wrapper-example from splunk-ansible --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index 41bc2b9b..cab751b7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -15,3 +15,4 @@ Jenkinsfile **/test-results **/molecule **/*.md +**/wrapper-example From 8d0620a5a279e890d5c89a5a69dfd760008c1dd7 Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Fri, 13 Mar 2020 14:53:20 -0700 Subject: [PATCH 2/2] Adding tests --- tests/test_docker_splunk.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_docker_splunk.py b/tests/test_docker_splunk.py index 1a49c932..afc22cf0 100644 --- a/tests/test_docker_splunk.py +++ b/tests/test_docker_splunk.py @@ -389,6 +389,11 @@ def test_splunk_entrypoint_no_provision(self): exec_command = self.client.exec_create(cid, "cat /opt/ansible/version.txt") std_out = self.client.exec_start(exec_command) assert len(std_out.strip()) == 40 + # Check that the wrapper-example directory does not exist + exec_command = self.client.exec_create(cid, "ls /opt/ansible/") + std_out = self.client.exec_start(exec_command) + assert "wrapper-example" not in std_out + assert "docs" not in std_out except Exception as e: self.logger.error(e) raise e @@ -467,6 +472,11 @@ def test_uf_entrypoint_no_provision(self): exec_command = self.client.exec_create(cid, "cat /opt/ansible/version.txt") std_out = self.client.exec_start(exec_command) assert len(std_out.strip()) == 40 + # Check that the wrapper-example directory does not exist + exec_command = self.client.exec_create(cid, "ls /opt/ansible/") + std_out = self.client.exec_start(exec_command) + assert "wrapper-example" not in std_out + assert "docs" not in std_out except Exception as e: self.logger.error(e) raise e