From 401b1616125054e9a34c08f33d5b04f8c5ddfd62 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Thu, 27 Jun 2024 13:48:05 -0700 Subject: [PATCH] Save json to the workspace Signed-off-by: Divya Madala --- src/test_workflow/benchmark_test/benchmark_test_suite.py | 1 + .../benchmark_test/test_benchmark_test_suite.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test_workflow/benchmark_test/benchmark_test_suite.py b/src/test_workflow/benchmark_test/benchmark_test_suite.py index 7b95d52e33..fd03f96a9b 100644 --- a/src/test_workflow/benchmark_test/benchmark_test_suite.py +++ b/src/test_workflow/benchmark_test/benchmark_test_suite.py @@ -92,6 +92,7 @@ def convert(self) -> None: with TemporaryDirectory() as work_dir: subprocess.check_call(f"docker cp docker-container-{self.args.stack_suffix}:opensearch-benchmark/. {str(work_dir.path)}", cwd=os.getcwd(), shell=True) file_path = glob.glob(os.path.join(str(work_dir.path), "test_executions", "*", "test_execution.json")) + shutil.copy(file_path[0], os.path.join(os.getcwd(), f"test_execution_{self.args.stack_suffix}.json")) with open(file_path[0]) as file: data = json.load(file) formatted_data = pd.json_normalize(data["results"]["op_metrics"]) diff --git a/tests/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py b/tests/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py index 6f6c7bbfd7..61e0e2351d 100644 --- a/tests/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py +++ b/tests/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py @@ -223,8 +223,9 @@ def test_execute_cluster_endpoint(self, mock_convert: Mock, mock_check_call: Moc @patch('builtins.open') @patch('logging.info') @patch('shutil.get_terminal_size') + @patch('shutil.copy') @patch('test_workflow.benchmark_test.benchmark_test_suite.subprocess.check_call') - def test_convert(self, mock_check_call: Mock, mock_get_terminal_size: Mock, mock_logging_info: Mock, mock_open: Mock, mock_json_load: Mock, mock_read_csv: Mock, + def test_convert(self, mock_check_call: Mock, mock_copy: Mock, mock_get_terminal_size: Mock, mock_logging_info: Mock, mock_open: Mock, mock_json_load: Mock, mock_read_csv: Mock, mock_json_normalize: Mock) -> None: self.args.cluster_endpoint = "abc.com" mock_get_terminal_size.return_value = MagicMock(columns=80) @@ -241,6 +242,7 @@ def test_convert(self, mock_check_call: Mock, mock_get_terminal_size: Mock, mock mock_glob.return_value = ['/mock/test_execution.json'] test_suite.convert() mock_temp_directory.assert_called_once() + mock_copy.assert_called_once() mock_check_call.assert_called_with(f"docker cp docker-container-{test_suite.args.stack_suffix}:opensearch-benchmark/. /mock/temp/dir", cwd=os.getcwd(), shell=True) mock_open.assert_called_once_with("/mock/test_execution.json") mock_json_load.assert_called_once()