debug test failures;

Author: adityapinglesf

tests/executor.py

@@ -235,10 +235,13 @@ def extract_json(self, container_name):
             import time
             print("sleeping now for 10; check if docker container exists")
             self.logger.info("sleeping now for 10; check if docker container exists")
-            time.sleep(20)
+            os.system("echo '----------- START  -----------'")
+            os.system("docker ps -a")
+            os.system(f"docker logs {container_name}")
+            os.system("echo '----------- END  -----------'")
             exec_command = self.client.exec_create(container_name, "cat /opt/container_artifact/ansible_inventory.json")
             print(f"collect exec command: {exec_command}")
-            json_data = self.client.exec_start(exec_command)
+            json_data = self.client.exec_start(exec_command).decode()
             if "No such file or directory" in json_data:
                 time.sleep(5)
             else: 
@@ -287,10 +290,10 @@ def _run_command(self, command, defaults_url=None, apps_url=None):
         self.logger.info("START RECORDING STDOUT")
         for line in iter(proc.stdout.readline, ''):
             self.logger.info(line)
-            lines.append(line)
+            lines.append(f"out: {line}")
         self.logger.info("START RECORDING STDERR")
         for line in iter(proc.stderr.readline, ''):
-            self.logger.info(line)
+            self.logger.info(f"err: {line}")
             err_lines.append(line)
         self.logger.info("PROC close stdout")
         proc.stdout.close()

tests/test_distributed_splunk_image.py

@@ -241,7 +241,7 @@ def test_compose_1uf1so(self):
                 raise e
         # Search results won't return the correct results immediately :(
         time.sleep(30)
-        search_providers, distinct_hosts = self.search_internal_distinct_hosts("{}_so1_1".format(self.project_name), password=self.password)
+        search_providers, distinct_hosts = self.search_internal_distinct_hosts("{}-so1-1".format(self.project_name), password=self.password)
         assert len(search_providers) == 1
         assert search_providers[0] == "so1"
         assert distinct_hosts == 2
@@ -842,7 +842,7 @@ def test_compose_1deployment1so(self):
             # Wait for containers to come up
             assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
             # Get container logs
-            container_mapping = {"{}_so1_1".format(self.project_name): "so", "{}_depserver1_1".format(self.project_name): "deployment_server"}
+            container_mapping = {"{}-so1-1".format(self.project_name): "so", "{}_depserver1_1".format(self.project_name): "deployment_server"}
             for container in container_mapping:
                 # Check ansible version & configs
                 ansible_logs = self.get_container_logs(container)
@@ -929,7 +929,7 @@ def test_compose_1deployment1uf(self):
             # Wait for containers to come up
             assert self.wait_for_containers(container_count, label="com.docker.compose.project={}".format(self.project_name))
             # Get container logs
-            container_mapping = {"{}_uf1_1".format(self.project_name): "uf", "{}_depserver1_1".format(self.project_name): "deployment_server"}
+            container_mapping = {"{}-uf1-1".format(self.project_name): "uf", "{}_depserver1_1".format(self.project_name): "deployment_server"}
             for container in container_mapping:
                 # Check ansible version & configs
                 ansible_logs = self.get_container_logs(container)