first pass tests - windows fixes

first pass

fix codeflash_capture

fix formatter

more tempfile changes

Update test_get_code.py

Author: KRRT7

codeflash/code_utils/coverage_utils.py

@@ -41,11 +41,11 @@ def build_fully_qualified_name(function_name: str, code_context: CodeOptimizatio
 
 def generate_candidates(source_code_path: Path) -> list[str]:
     """Generate all the possible candidates for coverage data based on the source code path."""
-    candidates = [source_code_path.name]
-    current_path = source_code_path.parent
+    candidates: list[str] = [source_code_path.name]
+    current_path: Path = source_code_path.parent
 
     while current_path != current_path.parent:
-        candidate_path = str(Path(current_path.name) / candidates[-1])
+        candidate_path = (Path(current_path.name) / candidates[-1]).as_posix()
         candidates.append(candidate_path)
         current_path = current_path.parent
 

tests/test_code_context_extractor.py

@@ -356,10 +356,9 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R:
             lifespan=self.__duration__,
         )
 '''
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -368,7 +367,7 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R:
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -557,10 +556,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -569,7 +567,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -637,10 +635,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -649,7 +646,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -717,10 +714,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -729,7 +725,7 @@ def helper_method(self):
                 test_framework="pytest",
                 pytest_cmd="pytest",
                 experiment_id=None,
-                test_project_root=Path().resolve(),
+                test_project_root=Path.cwd(),
             )
         )
         function_to_optimize = FunctionToOptimize(
@@ -787,10 +783,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -838,10 +833,9 @@ def __repr__(self):
     def helper_method(self):
         return self.x
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),
@@ -1272,10 +1266,9 @@ def target_method(self):
 def outside_method():
     return 1
 """
-    with tempfile.NamedTemporaryFile(mode="w") as f:
-        f.write(code)
-        f.flush()
-        file_path = Path(f.name).resolve()
+    with tempfile.TemporaryDirectory() as temp_dir:
+        file_path = Path(temp_dir) / "test.py"
+        file_path.write_text(code)
         opt = Optimizer(
             Namespace(
                 project_root=file_path.parent.resolve(),

tests/test_code_utils.py

@@ -14,10 +14,10 @@
     get_imports_from_file,
     get_qualified_name,
     get_run_tmp_file,
+    has_any_async_functions,
     is_class_defined_in_file,
     module_name_from_file_path,
     path_belongs_to_site_packages,
-    has_any_async_functions,
 )
 from codeflash.code_utils.concolic_utils import clean_concolic_tests
 from codeflash.code_utils.coverage_utils import generate_candidates, prepare_coverage_files
@@ -254,7 +254,7 @@ def test_get_run_tmp_file_reuses_temp_directory() -> None:
 
 
 def test_path_belongs_to_site_packages_with_site_package_path(monkeypatch: pytest.MonkeyPatch) -> None:
-    site_packages = [Path("/usr/local/lib/python3.9/site-packages")]
+    site_packages = [Path("/usr/local/lib/python3.9/site-packages").resolve()]
     monkeypatch.setattr(site, "getsitepackages", lambda: site_packages)
 
     file_path = Path("/usr/local/lib/python3.9/site-packages/some_package")

tests/test_codeflash_capture.py

@@ -42,7 +42,7 @@ def test_example_test_3(self):
 class MyClass:
     def __init__(self):
         self.x = 2
-        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir!s}')}}|TEST_INFO_END")
+        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir.resolve().as_posix()}')}}|TEST_INFO_END")
 """
     test_file_name = "test_stack_info_temp.py"
 
@@ -117,7 +117,7 @@ def test_example_test_3(self):
 class MyClass:
     def __init__(self):
         self.x = 2
-        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir!s}')}}|TEST_INFO_END")
+        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir.resolve().as_posix()}')}}|TEST_INFO_END")
 """
     test_file_name = "test_stack_info_temp.py"
 
@@ -181,7 +181,7 @@ def test_example_test_3(self):
 class MyClass:
     def __init__(self):
         self.x = 2
-        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir!s}')}}|TEST_INFO_END")
+        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir.resolve().as_posix()}')}}|TEST_INFO_END")
 """
     test_dir = (Path(__file__).parent.parent / "code_to_optimize" / "tests" / "pytest").resolve()
     test_file_name = "test_stack_info_temp.py"
@@ -261,7 +261,7 @@ class MyClass:
     def __init__(self):
         self.x = 2
         # Print out the detected test info each time we instantiate MyClass
-        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir!s}')}}|TEST_INFO_END")
+        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir.resolve().as_posix()}')}}|TEST_INFO_END")
 """
 
     test_file_name = "test_stack_info_recursive_temp.py"
@@ -343,7 +343,7 @@ def test_example_test():
 class MyClass:
     def __init__(self):
         self.x = 2
-        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir!s}')}}|TEST_INFO_END")
+        print(f"TEST_INFO_START|{{get_test_info_from_stack('{test_dir.resolve().as_posix()}')}}|TEST_INFO_END")
 """
     test_dir = (Path(__file__).parent.parent / "code_to_optimize" / "tests" / "pytest").resolve()
     test_file_name = "test_stack_info_temp.py"
@@ -413,7 +413,7 @@ def test_example_test_3(self):
     sample_code = f"""
 from codeflash.verification.codeflash_capture import codeflash_capture
 class MyClass:
-    @codeflash_capture(function_name="some_function", tmp_dir_path="{get_run_tmp_file(Path("test_return_values"))}", tests_root="{test_dir!s}")
+    @codeflash_capture(function_name="some_function", tmp_dir_path="{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}", tests_root="{test_dir.resolve().as_posix()}")
     def __init__(self, x=2):
         self.x = x
     """
@@ -536,7 +536,7 @@ def __init__(self):
         self.x = 2
 
 class MyClass(ParentClass):
-    @codeflash_capture(function_name="some_function", tmp_dir_path="{get_run_tmp_file(Path("test_return_values"))}", tests_root="{test_dir!s}")
+    @codeflash_capture(function_name="some_function", tmp_dir_path="{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}", tests_root="{test_dir.resolve().as_posix()}")
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
     """
@@ -653,9 +653,9 @@ def test_example_test():
 
 class MyClass:
     @codeflash_capture(
-        function_name="some_function", 
-        tmp_dir_path="{get_run_tmp_file(Path("test_return_values"))}", 
-        tests_root="{test_dir!s}"
+        function_name="some_function",
+        tmp_dir_path="{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}",
+        tests_root="{test_dir.resolve().as_posix()}"
     )
     def __init__(self, x=2):
         self.x = x
@@ -771,7 +771,7 @@ def test_helper_classes():
 from code_to_optimize.tests.pytest.helper_file_2 import HelperClass2, AnotherHelperClass
 
 class MyClass:
-    @codeflash_capture(function_name='MyClass.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values"))}', tests_root="{test_dir!s}" , is_fto=True)
+    @codeflash_capture(function_name='MyClass.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}', tests_root="{test_dir.resolve().as_posix()}" , is_fto=True)
     def __init__(self):
         self.x = 1
 
@@ -785,7 +785,7 @@ def target_function(self):
 from codeflash.verification.codeflash_capture import codeflash_capture
 
 class HelperClass1:
-    @codeflash_capture(function_name='HelperClass1.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values"))}',  tests_root="{test_dir!s}", is_fto=False)
+    @codeflash_capture(function_name='HelperClass1.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}',  tests_root="{test_dir.resolve().as_posix()}", is_fto=False)
     def __init__(self):
         self.y = 1
 
@@ -797,15 +797,15 @@ def helper1(self):
 from codeflash.verification.codeflash_capture import codeflash_capture
 
 class HelperClass2:
-    @codeflash_capture(function_name='HelperClass2.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values"))}', tests_root="{test_dir!s}", is_fto=False)
+    @codeflash_capture(function_name='HelperClass2.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}', tests_root="{test_dir.resolve().as_posix()}", is_fto=False)
     def __init__(self):
         self.z = 2
 
     def helper2(self):
         return 2
 
 class AnotherHelperClass:
-    @codeflash_capture(function_name='AnotherHelperClass.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values"))}', tests_root="{test_dir!s}", is_fto=False)
+    @codeflash_capture(function_name='AnotherHelperClass.__init__', tmp_dir_path='{get_run_tmp_file(Path("test_return_values")).resolve().as_posix()}', tests_root="{test_dir.resolve().as_posix()}", is_fto=False)
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 

tests/test_formatter.py

@@ -33,10 +33,10 @@ def test_sorting_imports():
 
 def test_sort_imports_without_formatting():
     """Test that imports are sorted when formatting is disabled and should_sort_imports is True."""
-    with tempfile.NamedTemporaryFile() as tmp:
-        tmp.write(b"import sys\nimport unittest\nimport os\n")
-        tmp.flush()
-        tmp_path = Path(tmp.name)
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "test.py"
+        with tmp_path.open("w") as tmp:
+            tmp.write("import sys\nimport unittest\nimport os\n")
 
         new_code = format_code(formatter_cmds=["disabled"], path=tmp_path)
         assert new_code is not None
@@ -105,16 +105,13 @@ def test_formatter_cmds_non_existent():
 ignore-paths = []
 """
 
-    with tempfile.NamedTemporaryFile(suffix=".toml", delete=False) as tmp:
-        tmp.write(config_data.encode())
-        tmp.flush()
-        tmp_path = Path(tmp.name)
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "pyproject.toml"
+        with tmp_path.open("w") as tmp:
+            tmp.write(config_data)
 
-    try:
         config, _ = parse_config_file(tmp_path)
         assert config["formatter_cmds"] == ["black $file"]
-    finally:
-        os.remove(tmp_path)
 
     try:
         import black
@@ -133,12 +130,13 @@ def foo():
 def foo():
     return os.path.join(sys.path[0], "bar")
 """
-    with tempfile.NamedTemporaryFile() as tmp:
-        tmp.write(original_code)
-        tmp.flush()
-        tmp_path = tmp.name
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "test.py"
+        with tmp_path.open("wb") as tmp:
+            tmp.write(original_code)
+            tmp.flush()
 
-        actual = format_code(formatter_cmds=["black $file"], path=Path(tmp_path))
+        actual = format_code(formatter_cmds=["black $file"], path=tmp_path.resolve())
         assert actual == expected
 
 
@@ -159,10 +157,11 @@ def foo():
 def foo():
     return os.path.join(sys.path[0], "bar")
 """
-    with tempfile.NamedTemporaryFile() as tmp:
-        tmp.write(original_code)
-        tmp.flush()
-        tmp_path = tmp.name
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "test.py"
+        with tmp_path.open("wb") as tmp:
+            tmp.write(original_code)
+            tmp.flush()
 
         actual = format_code(formatter_cmds=["black $file"], path=Path(tmp_path))
         assert actual == expected
@@ -185,10 +184,11 @@ def foo():
 def foo():
     return os.path.join(sys.path[0], "bar")
 """
-    with tempfile.NamedTemporaryFile(suffix=".py") as tmp:
-        tmp.write(original_code)
-        tmp.flush()
-        tmp_path = tmp.name
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "test.py"
+        with tmp_path.open("wb") as tmp:
+            tmp.write(original_code)
+            tmp.flush()
 
         actual = format_code(
             formatter_cmds=["ruff check --exit-zero --fix $file", "ruff format $file"], path=Path(tmp_path)
@@ -203,9 +203,10 @@ def test_formatter_error():
 def foo():
     return os.path.join(sys.path[0], 'bar')"""
     expected = original_code
-    with tempfile.NamedTemporaryFile("w") as tmp:
-        tmp.write(original_code)
-        tmp.flush()
-        tmp_path = tmp.name
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir) / "test.py"
+        with tmp_path.open("w") as tmp:
+            tmp.write(original_code)
+
         with pytest.raises(FileNotFoundError):
-            format_code(formatter_cmds=["exit 1"], path=Path(tmp_path))
+            format_code(formatter_cmds=["exit 1"], path=tmp_path.resolve())