13403: Disable assertion rewriting for external modules - move root path to AssertState

Author: Tusenka

src/_pytest/assertion/__init__.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import os
 from collections.abc import Generator
 import sys
 from typing import Any
@@ -111,7 +112,7 @@ def __init__(self, config: Config, mode) -> None:
         self.mode = mode
         self.trace = config.trace.root.get("assertion")
         self.hook: rewrite.AssertionRewritingHook | None = None
-
+        self.root_path=os.getcwd()
 
 def install_importhook(config: Config) -> rewrite.AssertionRewritingHook:
     """Try to install the rewrite hook, raise SystemError if it fails."""

src/_pytest/assertion/rewrite.py

@@ -133,7 +133,7 @@ def find_spec(
 
         return importlib.util.spec_from_file_location(
             name,
-            fn,
+            fn  ,
             loader=self,
             submodule_search_locations=spec.submodule_search_locations,
         )
@@ -218,8 +218,7 @@ def _early_rewrite_bailout(self, name: str, state: AssertionState) -> bool:
             if fnmatch_ex(pat, path):
                 return False
 
-        root_path = self._get_root_path()
-        if not path.is_relative_to(root_path):
+        if not path.is_relative_to(state.root_path):
             return True
 
         if self._is_marked_for_rewrite(name, state):
@@ -242,8 +241,7 @@ def _should_rewrite(self, name: str, fn: str, state: AssertionState) -> bool:
         # modules not passed explicitly on the command line are only
         # rewritten if they match the naming convention for test files
         fn_path = PurePath(fn)
-        root_path = self._get_root_path()
-        if not fn_path.is_relative_to(root_path):
+        if not fn_path.is_relative_to(state.root_path):
             return False
 
         for pat in self.fnpats:
@@ -253,13 +251,6 @@ def _should_rewrite(self, name: str, fn: str, state: AssertionState) -> bool:
 
         return self._is_marked_for_rewrite(name, state)
 
-    @staticmethod
-    def _get_root_path():
-        try:
-            root_path = os.getcwd()
-            return root_path
-        except FileNotFoundError:
-            return os.path.dirname(os.path.abspath(sys.argv[0]))
 
     def _is_marked_for_rewrite(self, name: str, state: AssertionState) -> bool:
         try:

testing/test_assertrewrite.py

@@ -12,6 +12,7 @@
 import inspect
 import marshal
 import os
+from os import mkdir
 from pathlib import Path
 import py_compile
 import re
@@ -1986,7 +1987,8 @@ def test_simple_failure():
             }
         )
         root_path = f"{os.getcwd()}/tests"
-        monkeypatch.setattr("os.getcwd", lambda: root_path)
+        mkdir(root_path)
+        monkeypatch.chdir(root_path)
         with mock.patch.object(hook, "fnpats", ["*.py"]):
             assert hook.find_spec("file") is None