< 3.12 fix

Author: KRRT7

tests/test_instrument_tests.py

@@ -315,7 +315,7 @@ def codeflash_wrap(
 '''
     if sys.version_info < (3, 12):
         expected += """    print(
-        fr"!######{{test_module_name}}:{{(test_class_name + '.' if test_class_name else '')}}{{test_name}}:{{function_name}}:{{loop_index}}:{{invocation_id}}######!"
+        f"!######{{test_module_name}}:{{(test_class_name + '.' if test_class_name else '')}}{{test_name}}:{{function_name}}:{{loop_index}}:{{invocation_id}}######!"
     )"""
     else:
         expected += """    print(
@@ -545,91 +545,91 @@ def test_sort():
             testing_time=0.1,
         )
         assert test_results[0].id.function_getting_tested == "sorter"
-        # assert test_results[0].id.iteration_id == "1_0"
-        # assert test_results[0].id.test_class_name is None
-        # assert test_results[0].id.test_function_name == "test_sort"
-        # assert (
-        #     test_results[0].id.test_module_path
-        #     == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
-        # )
-#         assert test_results[0].runtime > 0
-#         assert test_results[0].did_pass
-#         assert test_results[0].return_value == ([0, 1, 2, 3, 4, 5],)
-
-#         assert test_results[1].id.function_getting_tested == "sorter"
-#         assert test_results[1].id.iteration_id == "4_0"
-#         assert test_results[1].id.test_class_name is None
-#         assert test_results[1].id.test_function_name == "test_sort"
-#         assert (
-#             test_results[1].id.test_module_path
-#             == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
-#         )
-#         assert test_results[1].runtime > 0
-#         assert test_results[1].did_pass
-
-#         with test_path_perf.open("w") as f:
-#             f.write(new_perf_test)
-
-#         test_results_perf, _ = func_optimizer.run_and_parse_tests(
-#             testing_type=TestingMode.PERFORMANCE,
-#             test_env=test_env,
-#             test_files=test_files,
-#             optimization_iteration=0,
-#             pytest_min_loops=1,
-#             pytest_max_loops=1,
-#             testing_time=0.1,
-#         )
-#         assert test_results_perf[0].id.function_getting_tested == "sorter"
-#         assert test_results_perf[0].id.iteration_id == "1_0"
-#         assert test_results_perf[0].id.test_class_name is None
-#         assert test_results_perf[0].id.test_function_name == "test_sort"
-#         assert (
-#             test_results_perf[0].id.test_module_path
-#             == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
-#         )
-#         assert test_results_perf[0].runtime > 0
-#         assert test_results_perf[0].did_pass
-#         assert test_results_perf[0].return_value is None
-
-#         assert test_results_perf[1].id.function_getting_tested == "sorter"
-#         assert test_results_perf[1].id.iteration_id == "4_0"
-#         assert test_results_perf[1].id.test_class_name is None
-#         assert test_results_perf[1].id.test_function_name == "test_sort"
-#         assert (
-#             test_results_perf[1].id.test_module_path
-#             == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
-#         )
-#         assert test_results_perf[1].runtime > 0
-#         assert test_results_perf[1].did_pass
-#         out_str = """codeflash stdout: Sorting list
-# result: [0, 1, 2, 3, 4, 5]
-
-# codeflash stdout: Sorting list
-# result: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]"""
-#         assert out_str == test_results_perf[1].stdout
-#         ctx_result = func_optimizer.get_code_optimization_context()
-#         code_context: CodeOptimizationContext = ctx_result.unwrap()
-#         original_helper_code: dict[Path, str] = {}
-#         helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
-#         for helper_function_path in helper_function_paths:
-#             with helper_function_path.open(encoding="utf8") as f:
-#                 helper_code = f.read()
-#                 original_helper_code[helper_function_path] = helper_code
-#         computed_fn_opt = True
-#         line_profiler_output_file = add_decorator_imports(
-#             func_optimizer.function_to_optimize, code_context)
-#         line_profile_results, _ = func_optimizer.run_and_parse_tests(
-#             testing_type=TestingMode.LINE_PROFILE,
-#             test_env=test_env,
-#             test_files=test_files,
-#             optimization_iteration=0,
-#             pytest_min_loops=1,
-#             pytest_max_loops=1,
-#             testing_time=0.1,
-#             line_profiler_output_file = line_profiler_output_file
-#         )
-#         tmp_lpr = list(line_profile_results["timings"].keys())
-#         assert len(tmp_lpr) == 1 and line_profile_results["timings"][tmp_lpr[0]][0][1]==2
+        assert test_results[0].id.iteration_id == "1_0"
+        assert test_results[0].id.test_class_name is None
+        assert test_results[0].id.test_function_name == "test_sort"
+        assert (
+            test_results[0].id.test_module_path
+            == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
+        )
+        assert test_results[0].runtime > 0
+        assert test_results[0].did_pass
+        assert test_results[0].return_value == ([0, 1, 2, 3, 4, 5],)
+
+        assert test_results[1].id.function_getting_tested == "sorter"
+        assert test_results[1].id.iteration_id == "4_0"
+        assert test_results[1].id.test_class_name is None
+        assert test_results[1].id.test_function_name == "test_sort"
+        assert (
+            test_results[1].id.test_module_path
+            == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
+        )
+        assert test_results[1].runtime > 0
+        assert test_results[1].did_pass
+
+        with test_path_perf.open("w") as f:
+            f.write(new_perf_test)
+
+        test_results_perf, _ = func_optimizer.run_and_parse_tests(
+            testing_type=TestingMode.PERFORMANCE,
+            test_env=test_env,
+            test_files=test_files,
+            optimization_iteration=0,
+            pytest_min_loops=1,
+            pytest_max_loops=1,
+            testing_time=0.1,
+        )
+        assert test_results_perf[0].id.function_getting_tested == "sorter"
+        assert test_results_perf[0].id.iteration_id == "1_0"
+        assert test_results_perf[0].id.test_class_name is None
+        assert test_results_perf[0].id.test_function_name == "test_sort"
+        assert (
+            test_results_perf[0].id.test_module_path
+            == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
+        )
+        assert test_results_perf[0].runtime > 0
+        assert test_results_perf[0].did_pass
+        assert test_results_perf[0].return_value is None
+
+        assert test_results_perf[1].id.function_getting_tested == "sorter"
+        assert test_results_perf[1].id.iteration_id == "4_0"
+        assert test_results_perf[1].id.test_class_name is None
+        assert test_results_perf[1].id.test_function_name == "test_sort"
+        assert (
+            test_results_perf[1].id.test_module_path
+            == "code_to_optimize.tests.pytest.test_perfinjector_bubble_sort_results_temp"
+        )
+        assert test_results_perf[1].runtime > 0
+        assert test_results_perf[1].did_pass
+        out_str = """codeflash stdout: Sorting list
+result: [0, 1, 2, 3, 4, 5]
+
+codeflash stdout: Sorting list
+result: [0.0, 1.0, 2.0, 3.0, 4.0, 5.0]"""
+        assert out_str == test_results_perf[1].stdout
+        ctx_result = func_optimizer.get_code_optimization_context()
+        code_context: CodeOptimizationContext = ctx_result.unwrap()
+        original_helper_code: dict[Path, str] = {}
+        helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
+        for helper_function_path in helper_function_paths:
+            with helper_function_path.open(encoding="utf8") as f:
+                helper_code = f.read()
+                original_helper_code[helper_function_path] = helper_code
+        computed_fn_opt = True
+        line_profiler_output_file = add_decorator_imports(
+            func_optimizer.function_to_optimize, code_context)
+        line_profile_results, _ = func_optimizer.run_and_parse_tests(
+            testing_type=TestingMode.LINE_PROFILE,
+            test_env=test_env,
+            test_files=test_files,
+            optimization_iteration=0,
+            pytest_min_loops=1,
+            pytest_max_loops=1,
+            testing_time=0.1,
+            line_profiler_output_file = line_profiler_output_file
+        )
+        tmp_lpr = list(line_profile_results["timings"].keys())
+        assert len(tmp_lpr) == 1 and line_profile_results["timings"][tmp_lpr[0]][0][1]==2
     finally:
         if computed_fn_opt:
             func_optimizer.write_code_and_helpers(