diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 16d56e4f..bc61b24b 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -361,14 +361,14 @@ def expect_aligned(data): def create_results(extra_args): self.template( - [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "result1.json", "cmdline_test.py"] + extra_args, - expected_output_file="result1.json", + [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "res1.json", "cmdline_test.py"] + extra_args, + expected_output_file="res1.json", cleanup=False, check_func=expect_no_sync_marker, ) self.template( - [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "result2.json", "cmdline_test.py"] + extra_args, - expected_output_file="result2.json", + [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "res2.json", "cmdline_test.py"] + extra_args, + expected_output_file="res2.json", cleanup=False, check_func=expect_no_sync_marker, ) @@ -378,19 +378,19 @@ def create_results(extra_args): create_results(extra_args) self.template( - [sys.executable, "-m", "viztracer", "--align_combine", "result1.json", "result2.json"], + [sys.executable, "-m", "viztracer", "--align_combine", "res1.json", "res2.json"], expected_output_file="result.json", check_func=expect_aligned, ) self.template( - [sys.executable, "-m", "viztracer", "--align_combine", "result1.json", "result2.json", "--use_sync_marker"], + [sys.executable, "-m", "viztracer", "--align_combine", "res1.json", "res2.json", "--use_sync_marker"], expected_output_file="result.json", check_func=expect_aligned, ) finally: - self.cleanup(output_file="result1.json", script_name="cmdline_test.py") - self.cleanup(output_file="result2.json", script_name="cmdline_test.py") + self.cleanup(output_file="res1.json", script_name="cmdline_test.py") + self.cleanup(output_file="res2.json", script_name="cmdline_test.py") @package_matrix(["~orjson", "orjson"]) def test_align_combine_sync_marker(self): @@ -415,9 +415,9 @@ def expect_aligned(data): self.assertAlmostEqual(0, offset_ts) def expect_aligned_to_sync_marker(data): - with open('result1.json', 'r') as f: + with open('res1.json', 'r') as f: result1 = json.load(f) - with open('result2.json', 'r') as f: + with open('res2.json', 'r') as f: result2 = json.load(f) self.assertIn('sync_marker', result1['viztracer_metadata']) @@ -441,15 +441,15 @@ def expect_aligned_to_sync_marker(data): def create_results(extra_args): self.template( - [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "result1.json", "cmdline_test.py"] + extra_args, - expected_output_file="result1.json", + [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "res1.json", "cmdline_test.py"] + extra_args, + expected_output_file="res1.json", script=test_script, cleanup=False, check_func=expect_sync_marker, ) self.template( - [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "result2.json", "cmdline_test.py"] + extra_args, - expected_output_file="result2.json", + [sys.executable, "-m", "viztracer", "--ignore_frozen", "-o", "res2.json", "cmdline_test.py"] + extra_args, + expected_output_file="res2.json", script=test_script, cleanup=False, check_func=expect_sync_marker, @@ -461,19 +461,19 @@ def create_results(extra_args): create_results(extra_args) self.template( - [sys.executable, "-m", "viztracer", "--align_combine", "result1.json", "result2.json"], + [sys.executable, "-m", "viztracer", "--align_combine", "res1.json", "res2.json"], expected_output_file="result.json", check_func=expect_aligned, ) self.template( - [sys.executable, "-m", "viztracer", "--align_combine", "result1.json", "result2.json", "--use_sync_marker"], + [sys.executable, "-m", "viztracer", "--align_combine", "res1.json", "res2.json", "--use_sync_marker"], expected_output_file="result.json", check_func=expect_aligned_to_sync_marker, ) finally: - self.cleanup(output_file="result1.json", script_name="cmdline_test.py") - self.cleanup(output_file="result2.json", script_name="cmdline_test.py") + self.cleanup(output_file="res1.json", script_name="cmdline_test.py") + self.cleanup(output_file="res2.json", script_name="cmdline_test.py") def test_tracer_entries(self): self.template([sys.executable, "-m", "viztracer", "--tracer_entries", "1000", "cmdline_test.py"])