From 49cd16e74ff496d5c63fa0051090dbb53ddb631d Mon Sep 17 00:00:00 2001 From: alesapin Date: Fri, 18 Jun 2021 22:08:12 +0300 Subject: [PATCH] Better --- tests/integration/helpers/cluster.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py index dbe7649b151..32edd8892ac 100644 --- a/tests/integration/helpers/cluster.py +++ b/tests/integration/helpers/cluster.py @@ -208,7 +208,7 @@ class ClickHouseCluster: instances_dir_name += '_' + self.name if 'INTEGRATION_TESTS_RUN_ID' in os.environ: - instances_dir_name += '_' + os.environ['INTEGRATION_TESTS_RUN_ID'] + instances_dir_name += '_' + shlex.quote(os.environ['INTEGRATION_TESTS_RUN_ID']) self.instances_dir = p.join(self.base_dir, instances_dir_name) self.docker_logs_path = p.join(self.instances_dir, 'docker.log') @@ -428,7 +428,15 @@ class ClickHouseCluster: pass def get_docker_handle(self, docker_id): - return self.docker_client.containers.get(docker_id) + exception = None + for i in range(5): + try: + return self.docker_client.containers.get(docker_id) + except Exception as ex: + print("Got exception getting docker handle", str(ex)) + time.sleep(i * 2) + exception = ex + raise exception def get_client_cmd(self): cmd = self.client_bin_path