fixes to sync with main

Author: alvin-r

codeflash/discovery/pytest_new_process_discovery.py

@@ -16,6 +16,12 @@ def pytest_collection_finish(self, session) -> None:
         collected_tests.extend(session.items)
         pytest_rootdir = session.config.rootdir
 
+    def pytest_collection_modifyitems(config, items):
+        skip_benchmark = pytest.mark.skip(reason="Skipping benchmark tests")
+        for item in items:
+            if "benchmark" in item.fixturenames:
+                item.add_marker(skip_benchmark)
+
 
 def parse_pytest_collection_results(pytest_tests: list[Any]) -> list[dict[str, str]]:
     test_results = []
@@ -34,7 +40,7 @@ def parse_pytest_collection_results(pytest_tests: list[Any]) -> list[dict[str, s
 
     try:
         exitcode = pytest.main(
-            [tests_root, "-pno:logging", "--collect-only", "-m", "not skip", "--benchmark-skip"], plugins=[PytestCollectionPlugin()]
+            [tests_root, "-p no:logging", "--collect-only", "-m", "not skip", "--benchmark-skip"], plugins=[PytestCollectionPlugin()]
         )
     except Exception as e:  # noqa: BLE001
         print(f"Failed to collect tests: {e!s}")  # noqa: T201

codeflash/tracer.py

@@ -247,14 +247,18 @@ def tracer_logic(self, frame: FrameType, event: str) -> None:
             return
         if self.timeout is not None and (time.time() - self.start_time) > self.timeout:
             sys.setprofile(None)
+            threading.setprofile(None)
             console.print(f"Codeflash: Timeout reached! Stopping tracing at {self.timeout} seconds.")
             return
         code = frame.f_code
+
         file_name = Path(code.co_filename).resolve()
         # TODO : It currently doesn't log the last return call from the first function
 
         if code.co_name in self.ignored_functions:
             return
+        if not file_name.is_relative_to(self.project_root):
+            return
         if not file_name.exists():
             return
         if self.functions and code.co_name not in self.functions:

codeflash/verification/test_results.py

@@ -62,8 +62,6 @@ def run_behavioral_tests(
             "--capture=tee-sys",
             f"--timeout={pytest_timeout}",
             "-q",
-            "-o",
-            "addopts=",
             "--codeflash_loops_scope=session",
             "--codeflash_min_loops=1",
             "--codeflash_max_loops=1",

codeflash/verification/test_runner.py

@@ -6,8 +6,6 @@
 
 from pydantic.dataclasses import dataclass
 
-from codeflash.code_utils.compat import SAFE_SYS_EXECUTABLE
-
 
 def get_test_file_path(test_dir: Path, function_name: str, iteration: int = 0, test_type: str = "unit") -> Path:
     assert test_type in {"unit", "inspired", "replay", "perf"}