From daae9b6920366c8bf2c71e6056c61d0997deb0fa Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Wed, 23 Nov 2022 22:02:08 -0700 Subject: [PATCH 1/4] testing something with git --- .../__self_contained_coordinator__/self_contained_coordinator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py index d931785c..0e1b1b11 100644 --- a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py +++ b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py @@ -402,6 +402,7 @@ def process_self_contained_coordinator_stream( images_loaded = docker_client.images.load(airgap_docker_image_bin) logging.info("Successfully loaded images {}".format(images_loaded)) +#Martin temp test for test_file in testsuite_spec_files: redis_containers = [] client_containers = [] From 9491d5e9f641b6fd04c80c9ae0987e130ebeb582 Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Wed, 23 Nov 2022 22:06:36 -0700 Subject: [PATCH 2/4] testing something with git - done --- .../__self_contained_coordinator__/self_contained_coordinator.py | 1 - 1 file changed, 1 deletion(-) diff --git a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py index 0e1b1b11..d931785c 100644 --- a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py +++ b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py @@ -402,7 +402,6 @@ def process_self_contained_coordinator_stream( images_loaded = docker_client.images.load(airgap_docker_image_bin) logging.info("Successfully loaded images {}".format(images_loaded)) -#Martin temp test for test_file in testsuite_spec_files: redis_containers = [] client_containers = [] From eb676429d547184423b7c3ea9509f69c4eb071dd Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Wed, 23 Nov 2022 22:40:23 -0700 Subject: [PATCH 3/4] Deleting temporary_dir_client at the end of the run. --- .../self_contained_coordinator.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py index d931785c..56245475 100644 --- a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py +++ b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py @@ -455,6 +455,11 @@ def process_self_contained_coordinator_stream( temporary_dir ) ) + logging.info( + "Using local temporary dir to persist client output files. Path: {}".format( + temporary_dir_client + ) + ) tf_github_org = "redis" tf_github_repo = "redis" setup_name = "oss-standalone" @@ -834,6 +839,10 @@ def process_self_contained_coordinator_stream( ) pass shutil.rmtree(temporary_dir, ignore_errors=True) + shutil.rmtree(temporary_dir_client, ignore_errors=True) + logging.info( + "Removing temporary dirs {} and {}".format(temporary_dir, temporary_dir_client) + ) overall_result &= test_result From f484e08b99cca29cd41003abbef2529339ff1b20 Mon Sep 17 00:00:00 2001 From: Martin Dimitrov Date: Fri, 25 Nov 2022 00:17:39 -0700 Subject: [PATCH 4/4] formatted using poetry run black . --- .../self_contained_coordinator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py index 56245475..7b2e0c68 100644 --- a/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py +++ b/redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py @@ -841,7 +841,9 @@ def process_self_contained_coordinator_stream( shutil.rmtree(temporary_dir, ignore_errors=True) shutil.rmtree(temporary_dir_client, ignore_errors=True) logging.info( - "Removing temporary dirs {} and {}".format(temporary_dir, temporary_dir_client) + "Removing temporary dirs {} and {}".format( + temporary_dir, temporary_dir_client + ) ) overall_result &= test_result