precommit pass

Author: aseembits93

codeflash/code_utils/code_utils.py

@@ -2,6 +2,7 @@
 
 import ast
 import os
+import re
 import shutil
 import site
 from contextlib import contextmanager
@@ -12,11 +13,12 @@
 import tomlkit
 
 from codeflash.cli_cmds.console import logger
+from codeflash.code_utils.config_parser import find_pyproject_toml
 
 
 @contextmanager
-def custom_addopts(pyproject_path: str = "pyproject.toml") -> None:
-    pyproject_file = Path(pyproject_path)
+def custom_addopts() -> None:
+    pyproject_file = find_pyproject_toml()
     original_content = None
 
     try:
@@ -28,28 +30,24 @@ def custom_addopts(pyproject_path: str = "pyproject.toml") -> None:
 
             # Backup original addopts
             original_addopts = data.get("tool", {}).get("pytest", {}).get("ini_options", {}).get("addopts", "")
-
-            # Set new addopts
-            if "tool" not in data:
-                data["tool"] = {}
-            if "pytest" not in data["tool"]:
-                data["tool"]["pytest"] = {}
-            if "ini_options" not in data["tool"]["pytest"]:
-                data["tool"]["pytest"]["ini_options"] = {}
-
-            data["tool"]["pytest"]["ini_options"]["addopts"] = [
-                x for x in original_addopts if x not in ["-n", "-n auto", "auto"]
-            ]
-
-            # Write modified file
-            with Path.open(pyproject_file, "w", encoding="utf-8") as f:
-                f.write(tomlkit.dumps(data))
+            # nothing to do if no addopts present
+            if original_addopts != "":
+                non_blacklist_plugin_args = re.sub(r"-n +\S+", "", " ".join(original_addopts)).split(" ")
+                if non_blacklist_plugin_args != original_addopts:
+                    data["tool"]["pytest"]["ini_options"]["addopts"] = non_blacklist_plugin_args
+                    # Write modified file
+                    with Path.open(pyproject_file, "w", encoding="utf-8") as f:
+                        f.write(tomlkit.dumps(data))
 
         yield
 
     finally:
         # Restore original file
-        if original_content and pyproject_file.exists():
+        if (
+            original_content
+            and pyproject_file.exists()
+            and tuple(original_addopts) not in {(), tuple(non_blacklist_plugin_args)}
+        ):
             with Path.open(pyproject_file, "w", encoding="utf-8") as f:
                 f.write(original_content)
 

codeflash/verification/test_runner.py

@@ -23,8 +23,9 @@ 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."""
-    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)
+    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)
 
 
 def run_behavioral_tests(
@@ -98,26 +99,24 @@ def run_behavioral_tests(
 
             blocklist_args = [f"-p no:{plugin}" for plugin in BEHAVIORAL_BLOCKLISTED_PLUGINS if plugin != "cov"]
 
-            with custom_addopts():
-                results = execute_test_subprocess(
-                    coverage_cmd + common_pytest_args + blocklist_args + result_args + test_files,
-                    cwd=cwd,
-                    env=pytest_test_env,
-                    timeout=600,
-                )
+            results = execute_test_subprocess(
+                coverage_cmd + common_pytest_args + blocklist_args + result_args + test_files,
+                cwd=cwd,
+                env=pytest_test_env,
+                timeout=600,
+            )
             logger.debug(
                 f"Result return code: {results.returncode}, "
                 f"{'Result stderr:' + str(results.stderr) if results.stderr else ''}"
             )
         else:
             blocklist_args = [f"-p no:{plugin}" for plugin in BEHAVIORAL_BLOCKLISTED_PLUGINS]
-            with custom_addopts():
-                results = execute_test_subprocess(
-                    pytest_cmd_list + common_pytest_args + blocklist_args + result_args + test_files,
-                    cwd=cwd,
-                    env=pytest_test_env,
-                    timeout=600,  # TODO: Make this dynamic
-                )
+            results = execute_test_subprocess(
+                pytest_cmd_list + common_pytest_args + blocklist_args + result_args + test_files,
+                cwd=cwd,
+                env=pytest_test_env,
+                timeout=600,  # TODO: Make this dynamic
+            )
             logger.debug(
                 f"""Result return code: {results.returncode}, {"Result stderr:" + str(results.stderr) if results.stderr else ""}"""
             )
@@ -195,13 +194,12 @@ def run_line_profile_tests(
         pytest_test_env["PYTEST_PLUGINS"] = "codeflash.verification.pytest_plugin"
         blocklist_args = [f"-p no:{plugin}" for plugin in BENCHMARKING_BLOCKLISTED_PLUGINS]
         pytest_test_env["LINE_PROFILE"] = "1"
-        with custom_addopts():
-            results = execute_test_subprocess(
-                pytest_cmd_list + pytest_args + blocklist_args + result_args + test_files,
-                cwd=cwd,
-                env=pytest_test_env,
-                timeout=600,  # TODO: Make this dynamic
-            )
+        results = execute_test_subprocess(
+            pytest_cmd_list + pytest_args + blocklist_args + result_args + test_files,
+            cwd=cwd,
+            env=pytest_test_env,
+            timeout=600,  # TODO: Make this dynamic
+        )
     else:
         msg = f"Unsupported test framework: {test_framework}"
         raise ValueError(msg)
@@ -256,13 +254,12 @@ def run_benchmarking_tests(
         pytest_test_env = test_env.copy()
         pytest_test_env["PYTEST_PLUGINS"] = "codeflash.verification.pytest_plugin"
         blocklist_args = [f"-p no:{plugin}" for plugin in BENCHMARKING_BLOCKLISTED_PLUGINS]
-        with custom_addopts():
-            results = execute_test_subprocess(
-                pytest_cmd_list + pytest_args + blocklist_args + result_args + test_files,
-                cwd=cwd,
-                env=pytest_test_env,
-                timeout=600,  # TODO: Make this dynamic
-            )
+        results = execute_test_subprocess(
+            pytest_cmd_list + pytest_args + blocklist_args + result_args + test_files,
+            cwd=cwd,
+            env=pytest_test_env,
+            timeout=600,  # TODO: Make this dynamic
+        )
     elif test_framework == "unittest":
         test_files = [file.benchmarking_file_path for file in test_paths.test_files]
         result_file_path, results = run_unittest_tests(
@@ -282,8 +279,7 @@ def run_unittest_tests(
     log_level = ["-v"] if verbose else []
     files = [str(file) for file in test_file_paths]
     output_file = ["--output-file", str(result_file_path)]
-    with custom_addopts():
-        results = execute_test_subprocess(
-            unittest_cmd_list + log_level + files + output_file, cwd=cwd, env=test_env, timeout=600
-        )
+    results = execute_test_subprocess(
+        unittest_cmd_list + log_level + files + output_file, cwd=cwd, env=test_env, timeout=600
+    )
     return result_file_path, results