Skip to content

Commit 48e626d

Browse files
debug test failure;
1 parent 3f09ee5 commit 48e626d

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

tests/executor.py

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Setup logging
2929
LOGGER = logging.getLogger("docker-splunk")
3030
LOGGER.setLevel(logging.INFO)
31-
file_handler = logging.handlers.RotatingFileHandler("/builds/core-ee/docker-images/docker_splunk_tests.log", maxBytes=25000000)
31+
file_handler = logging.handlers.RotatingFileHandler("./docker_splunk_tests.log", maxBytes=25000000)
3232
formatter = logging.Formatter('%(asctime)s %(levelname)s [%(name)s] [%(process)d] %(message)s')
3333
file_handler.setFormatter(formatter)
3434
LOGGER.addHandler(file_handler)
@@ -128,7 +128,6 @@ def wait_for_containers(self, count, label=None, name=None, timeout=500):
128128
'''
129129
NOTE: This helper method can only be used for `compose up` scenarios where self.project_name is defined
130130
'''
131-
print(f"now WAITING for CONTAINERS to be UP")
132131
start = time.time()
133132
end = start
134133
# Wait
@@ -153,22 +152,14 @@ def wait_for_containers(self, count, label=None, name=None, timeout=500):
153152
print(f"SCRIPT FAILS TO CREATE CONTAINER")
154153
sys.exit(1)
155154
elif "Ansible playbook complete" in output:
156-
print(f"ANSIBLE EXEC COMPLETE")
157155
self.logger.info("Container {} is ready".format(container["Names"][0]))
158156
healthy_count += 1
159-
else:
160-
print(f"IN ELSE WHICH WAS NOT EXPECTED:")
161-
print("-------- START LOG ----------")
162-
print(output)
163-
print("-------- END LOG ----------")
164157
else:
165-
print("ALL GOOD ELSE")
166158
self.logger.info("Container {} is ready".format(container["Names"][0]))
167159
healthy_count += 1
168160
if healthy_count == count:
169161
self.logger.info("All containers ready to proceed")
170162
break
171-
print(f"continue for loop without break")
172163
time.sleep(5)
173164
end = time.time()
174165
return True
@@ -234,19 +225,19 @@ def _run_splunk_query(self, container_id, query, username="admin", password="pas
234225
def compose_up(self, defaults_url=None, apps_url=None):
235226
container_count = self.get_number_of_containers(os.path.join(self.SCENARIOS_DIR, self.compose_file_name))
236227
command = "docker compose -p {} -f test_scenarios/{} up -d".format(self.project_name, self.compose_file_name)
237-
print(f"LOOK AT THIS COMMAND")
238-
print(command)
239228
out, err, rc = self._run_command(command, defaults_url, apps_url)
240-
print("COMPLETED DOCKER COMPOSE")
241-
print(f"check RC for docker compose: {rc}; check err for docker compose: {err}")
242-
print("check output for docker compose")
243-
print(out)
244229
return container_count, rc
245230

246231
def extract_json(self, container_name):
247232
retries = 15
248233
for i in range(retries):
234+
print("DEBUG: EXTRACT JSON")
235+
import time
236+
print("sleeping now for 10; check if docker container exists")
237+
self.logger.info("sleeping now for 10; check if docker container exists")
238+
time.sleep(20)
249239
exec_command = self.client.exec_create(container_name, "cat /opt/container_artifact/ansible_inventory.json")
240+
print(f"collect exec command: {exec_command}")
250241
json_data = self.client.exec_start(exec_command)
251242
if "No such file or directory" in json_data:
252243
time.sleep(5)

tests/requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ pytest==4.4.0
22
pyrsistent==0.16.1
33
requests
44
docker
5-
PyYAML
6-
docker-compose
75
pyasn1
86
junit-xml
97
pytest-xdist

0 commit comments

Comments
 (0)