bugfix

Author: aseembits93

codeflash/code_utils/code_utils.py

@@ -88,17 +88,18 @@ def add_addopts_to_pyproject() -> None:
 
 
 @contextmanager
-def rename_conftest() -> None:
-    conftest_file = find_conftest()
-    tmp_conftest_file = Path(conftest_file + ".tmp")
+def rename_conftest(tests_path: Path) -> None:
+    conftest_file = find_conftest(tests_path)
+    tmp_conftest_file = None
     try:
         # Rename original file
-        if conftest_file.exists():
+        if conftest_file:
+            tmp_conftest_file = Path(str(conftest_file) + ".tmp")
             conftest_file.rename(tmp_conftest_file)
         yield
     finally:
         # Restore original file
-        if conftest_file.exists():
+        if conftest_file:
             tmp_conftest_file.rename(conftest_file)
 
 

codeflash/code_utils/config_parser.py

@@ -31,15 +31,16 @@ def find_pyproject_toml(config_file: Path | None = None) -> Path:
     raise ValueError(msg)
 
 
-def find_conftest() -> Union[Path, None]:
+def find_conftest(tests_path: Path) -> Union[Path, None]:
     # Find the conftest file on the root of the project
     dir_path = Path.cwd()
-    while dir_path != dir_path.parent:
-        config_file = dir_path / "conftest.py"
+    cur_path = tests_path
+    while cur_path != dir_path:
+        config_file = cur_path / "conftest.py"
         if config_file.exists():
             return config_file
         # Search for conftest.py in the parent directories
-        dir_path = dir_path.parent
+        cur_path = cur_path.parent
     return None
 
 

codeflash/discovery/discover_unit_tests.py

@@ -157,7 +157,7 @@ def discover_tests_pytest(
     project_root = cfg.project_root_path
 
     tmp_pickle_path = get_run_tmp_file("collected_tests.pkl")
-    with custom_addopts(), rename_conftest():
+    with custom_addopts(), rename_conftest(tests_root):
         result = subprocess.run(
             [
                 SAFE_SYS_EXECUTABLE,

codeflash/verification/test_runner.py

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING
 
 from codeflash.cli_cmds.console import logger
-from codeflash.code_utils.code_utils import custom_addopts, get_run_tmp_file, rename_conftest
+from codeflash.code_utils.code_utils import custom_addopts, get_run_tmp_file
 from codeflash.code_utils.compat import IS_POSIX, SAFE_SYS_EXECUTABLE
 from codeflash.code_utils.config_consts import TOTAL_LOOPING_TIME
 from codeflash.code_utils.coverage_utils import prepare_coverage_files
@@ -23,7 +23,7 @@ def execute_test_subprocess(
     cmd_list: list[str], cwd: Path, env: dict[str, str] | None, timeout: int = 600
 ) -> subprocess.CompletedProcess:
     """Execute a subprocess with the given command list, working directory, environment variables, and timeout."""
-    with custom_addopts(), rename_conftest():
+    with custom_addopts():
         logger.debug(f"executing test run with command: {' '.join(cmd_list)}")
         return subprocess.run(cmd_list, capture_output=True, cwd=cwd, env=env, text=True, timeout=timeout, check=False)