13403: Disable assertion rewriting for external modules

pre-commit-ci[bot] · Tusenka · commit 3d26321c1f44 · 2025-08-09T10:52:08.000+03:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.11.11"
+  rev: "v0.11.12"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.8.0
+  rev: v1.9.0
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
@@ -32,7 +32,7 @@ repos:
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.0
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)
diff --git a/changelog/13403.bugfix.rst b/changelog/13403.bugfix.rst
@@ -0,0 +1 @@
+Disable assertion for modules outside current working dir(cwd)
diff --git a/changelog/13492.doc.rst b/changelog/13492.doc.rst
@@ -0,0 +1 @@
+Fixed outdated warning about ``faulthandler`` not working on Windows.
diff --git a/doc/en/how-to/failures.rst b/doc/en/how-to/failures.rst
@@ -112,7 +112,7 @@ on the command-line.
 
 Also the :confval:`faulthandler_timeout=X<faulthandler_timeout>` configuration option can be used
 to dump the traceback of all threads if a test takes longer than ``X``
-seconds to finish (not available on Windows).
+seconds to finish.
 
 .. note::
 
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/pyproject.toml b/pyproject.toml
@@ -339,7 +339,7 @@ disable = [
 ]
 
 [tool.codespell]
-ignore-words-list = "afile,asend,asser,assertio,feld,hove,ned,noes,notin,paramete,parth,socio-economic,tesults,varius,wil"
+ignore-words-list = "afile,asend,asser,assertio,feld,hove,ned,noes,notin,paramete,parth,tesults,varius,wil"
 skip = "AUTHORS,*/plugin_list.rst"
 write-changes = true
 
diff --git a/src/_pytest/assertion/__init__.py b/src/_pytest/assertion/__init__.py
@@ -110,6 +110,7 @@ class AssertionState:
     def __init__(self, config: Config, mode) -> None:
         self.mode = mode
         self.trace = config.trace.root.get("assertion")
+        self.invocation_path = str(config.invocation_params.dir)
         self.hook: rewrite.AssertionRewritingHook | None = None
 
 
diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
@@ -239,7 +239,9 @@ def _should_rewrite(self, name: str, fn: str, state: AssertionState) -> bool:
         # rewritten if they match the naming convention for test files
         fn_path = PurePath(fn)
         for pat in self.fnpats:
-            if fnmatch_ex(pat, fn_path):
+            if fnmatch_ex(pat, fn_path) and fn_path.is_relative_to(
+                state.invocation_path
+            ):
                 state.trace(f"matched test file {fn!r}")
                 return True
 
@@ -702,7 +704,6 @@ def run(self, mod: ast.Module) -> None:
         if doc is not None and self.is_rewrite_disabled(doc):
             return
         pos = 0
-        item = None
         for item in mod.body:
             if (
                 expect_docstring
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -284,7 +284,7 @@ def get_config(
     args: list[str] | None = None,
     plugins: Sequence[str | _PluggyPlugin] | None = None,
 ) -> Config:
-    # subsequent calls to main will create a fresh instance
+    # Subsequent calls to main will create a fresh instance.
     pluginmanager = PytestPluginManager()
     config = Config(
         pluginmanager,
@@ -330,21 +330,21 @@ def _prepareconfig(
         )
         raise TypeError(msg.format(args, type(args)))
 
-    config = get_config(args, plugins)
-    pluginmanager = config.pluginmanager
+    initial_config = get_config(args, plugins)
+    pluginmanager = initial_config.pluginmanager
     try:
         if plugins:
             for plugin in plugins:
                 if isinstance(plugin, str):
                     pluginmanager.consider_pluginarg(plugin)
                 else:
                     pluginmanager.register(plugin)
-        config = pluginmanager.hook.pytest_cmdline_parse(
+        config: Config = pluginmanager.hook.pytest_cmdline_parse(
             pluginmanager=pluginmanager, args=args
         )
         return config
     except BaseException:
-        config._ensure_unconfigure()
+        initial_config._ensure_unconfigure()
         raise
 
 
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
@@ -1106,8 +1106,7 @@ def execute(self, request: SubRequest) -> FixtureValue:
                     exc, exc_tb = self.cached_result[2]
                     raise exc.with_traceback(exc_tb)
                 else:
-                    result = self.cached_result[0]
-                    return result
+                    return self.cached_result[0]
             # We have a previous but differently parametrized fixture instance
             # so we need to tear it down before creating a new one.
             self.finish(request)
@@ -1123,10 +1122,12 @@ def execute(self, request: SubRequest) -> FixtureValue:
         ihook = request.node.ihook
         try:
             # Setup the fixture, run the code in it, and cache the value
-            # in self.cached_result
-            result = ihook.pytest_fixture_setup(fixturedef=self, request=request)
+            # in self.cached_result.
+            result: FixtureValue = ihook.pytest_fixture_setup(
+                fixturedef=self, request=request
+            )
         finally:
-            # schedule our finalizer, even if the setup failed
+            # Schedule our finalizer, even if the setup failed.
             request.node.addfinalizer(finalizer)
 
         return result
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
@@ -40,6 +40,7 @@
 
 from _pytest import timing
 from _pytest._code import Source
+from _pytest.assertion.rewrite import assertstate_key
 from _pytest.capture import _get_multicapture
 from _pytest.compat import NOTSET
 from _pytest.compat import NotSetType
@@ -749,6 +750,9 @@ def chdir(self) -> None:
         This is done automatically upon instantiation.
         """
         self._monkeypatch.chdir(self.path)
+        self._monkeypatch.setattr(
+            self._request.config.stash[assertstate_key], "invocation_path", self.path
+        )
 
     def _makefile(
         self,
diff --git a/src/_pytest/python_api.py b/src/_pytest/python_api.py
@@ -474,8 +474,7 @@ def is_bool(val: Any) -> bool:
         result: bool = abs(self.expected - actual) <= self.tolerance
         return result
 
-    # Ignore type because of https://github.com/python/mypy/issues/4266.
-    __hash__ = None  # type: ignore
+    __hash__ = None
 
     @property
     def tolerance(self):
diff --git a/src/_pytest/recwarn.py b/src/_pytest/recwarn.py
@@ -167,7 +167,7 @@ def warns(
             return func(*args[1:], **kwargs)
 
 
-class WarningsRecorder(warnings.catch_warnings):  # type:ignore[type-arg]
+class WarningsRecorder(warnings.catch_warnings):
     """A context manager to record raised warnings.
 
     Each recorded warning is an instance of :class:`warnings.WarningMessage`.
@@ -226,7 +226,9 @@ def clear(self) -> None:
         """Clear the list of recorded warnings."""
         self._list[:] = []
 
-    def __enter__(self) -> Self:
+    # Type ignored because we basically want the `catch_warnings` generic type
+    # parameter to be ourselves but that is not possible(?).
+    def __enter__(self) -> Self:  # type: ignore[override]
         if self._entered:
             __tracebackhide__ = True
             raise RuntimeError(f"Cannot enter {self!r} twice")
diff --git a/testing/example_scripts/rewrite/pytest.ini b/testing/example_scripts/rewrite/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+python_files = *.py
diff --git a/testing/example_scripts/rewrite/some_plugin/__init__.py b/testing/example_scripts/rewrite/some_plugin/__init__.py
@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+import pytest
+
+
+@pytest.fixture
+def special_asserter():
+    def special_assert(x, y):
+        assert {"x": x} == {"x": y}
+
+    return special_assert
diff --git a/testing/example_scripts/rewrite/src/__init__.py b/testing/example_scripts/rewrite/src/__init__.py
diff --git a/testing/example_scripts/rewrite/src/main.py b/testing/example_scripts/rewrite/src/main.py
@@ -0,0 +1,9 @@
+"""Stub file for testing"""
+
+from __future__ import annotations
+
+
+def func(x: int, y: int) -> int:
+    """Stub function"""
+    assert (x) > 0
+    return 0 if x == y else 1 if x > y else -1
diff --git a/testing/example_scripts/rewrite/tests/__init__.py b/testing/example_scripts/rewrite/tests/__init__.py
diff --git a/testing/example_scripts/rewrite/tests/conftest.py b/testing/example_scripts/rewrite/tests/conftest.py
@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from _pytest.fixtures import fixture
+
+
+pytest_plugins = ["pytester", "some_plugin"]
+
+
+@fixture
+def b():
+    return 1
+
+
+@fixture
+def a():
+    return 2
diff --git a/testing/example_scripts/rewrite/tests/test_main.py b/testing/example_scripts/rewrite/tests/test_main.py
@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from typing import Callable
+
+from testing.example_scripts.rewrite.src.main import func
+
+
+def test_plugin(a: int, b: int, special_asserter: Callable[[int, int], bool]):
+    special_asserter(a, b)
+
+
+def test_func(a: int, b: int, special_asserter: Callable[[int, int], bool]):
+    assert {"res": func(a, b)} == {"res": 0}
diff --git a/testing/example_scripts/rewrite/venv/lib64/python3.11/site-packages/external_lib/__init__.py b/testing/example_scripts/rewrite/venv/lib64/python3.11/site-packages/external_lib/__init__.py
diff --git a/testing/example_scripts/rewrite/venv/lib64/python3.11/site-packages/external_lib/external_lib.py b/testing/example_scripts/rewrite/venv/lib64/python3.11/site-packages/external_lib/external_lib.py
@@ -0,0 +1,3 @@
+def some_check(a: int):
+    assert abs(a)<2
+    return a in set(0, 1, -1)
diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py
@@ -29,12 +29,14 @@
 from _pytest.assertion.rewrite import _get_maxsize_for_saferepr
 from _pytest.assertion.rewrite import _saferepr
 from _pytest.assertion.rewrite import AssertionRewritingHook
+from _pytest.assertion.rewrite import assertstate_key
 from _pytest.assertion.rewrite import get_cache_dir
 from _pytest.assertion.rewrite import PYC_TAIL
 from _pytest.assertion.rewrite import PYTEST_TAG
 from _pytest.assertion.rewrite import rewrite_asserts
 from _pytest.config import Config
 from _pytest.config import ExitCode
+from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pathlib import make_numbered_dir
 from _pytest.pytester import Pytester
 import pytest
@@ -370,6 +372,7 @@ def test_rewrites_plugin_as_a_package(self, pytester: Pytester) -> None:
         pytester.makeconftest('pytest_plugins = ["plugin"]')
         pytester.makepyfile("def test(special_asserter): special_asserter(1, 2)\n")
         result = pytester.runpytest()
+
         result.stdout.fnmatch_lines(["*assert 1 == 2*"])
 
     def test_honors_pep_235(self, pytester: Pytester, monkeypatch) -> None:
@@ -1294,6 +1297,36 @@ def test_meta_path():
         )
         assert pytester.runpytest().ret == 0
 
+    def test_invocation_dir(self, pytester: Pytester, monkeypatch: MonkeyPatch) -> None:
+        """Test get invocation param from AssertionState"""
+        from _pytest.assertion import AssertionState
+
+        config = pytester.parseconfig()
+        state = AssertionState(config, "rewrite")
+
+        assert state.invocation_path == str(config.invocation_params.dir)
+
+        new_rootpath = pytester.path / "test"
+        if not os.path.exists(new_rootpath):
+            os.mkdir(new_rootpath)
+        monkeypatch.setattr(
+            config,
+            "invocation_params",
+            Config.InvocationParams(
+                args=(),
+                plugins=(),
+                dir=new_rootpath,
+            ),
+        )
+        state = AssertionState(config, "rewrite")
+        assert state.invocation_path == str(new_rootpath)
+
+    @pytest.mark.skipif(
+        sys.platform.startswith("win32"), reason="cannot remove cwd on Windows"
+    )
+    @pytest.mark.skipif(
+        sys.platform.startswith("sunos5"), reason="cannot remove cwd on Solaris"
+    )
     def test_write_pyc(self, pytester: Pytester, tmp_path) -> None:
         from _pytest.assertion import AssertionState
         from _pytest.assertion.rewrite import _write_pyc
@@ -1971,6 +2004,32 @@ def test_simple_failure():
             assert hook.find_spec("file") is not None
             assert self.find_spec_calls == ["file"]
 
+    def test_assert_rewrites_only_invocation_path(
+        self, pytester: Pytester, hook: AssertionRewritingHook, monkeypatch
+    ) -> None:
+        """Do not rewrite assertions in tests outside `AssertState.rootpath` (#13403)."""
+        pytester.makepyfile(
+            **{
+                "file.py": """\
+                    def test_simple_failure():
+                        assert 1 + 1 == 3
+                """
+            }
+        )
+
+        with mock.patch.object(hook, "fnpats", ["*.py"]):
+            assert hook.find_spec("file") is not None
+
+        invocation_path = f"{os.getcwd()}/tests"
+        monkeypatch.setattr(
+            pytester._request.config.stash[assertstate_key],
+            "invocation_path",
+            invocation_path,
+        )
+
+        with mock.patch.object(hook, "fnpats", ["*.py"]):
+            assert hook.find_spec("file") is None
+
     @pytest.mark.skipif(
         sys.platform.startswith("win32"), reason="cannot remove cwd on Windows"
     )
diff --git a/testing/test_collection.py b/testing/test_collection.py
@@ -1615,7 +1615,7 @@ def __init__(self, name, parent, x):
             self.x = x
 
         @classmethod
-        def from_parent(cls, parent, *, name, x):
+        def from_parent(cls, parent, *, name, x):  # type: ignore[override]
             return super().from_parent(parent=parent, name=name, x=x)
 
     collector = MyCollector.from_parent(parent=request.session, name="foo", x=10)
diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Disable assertion for modules outside current working dir(cwd)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed outdated warning about ``faulthandler`` not working on Windows.
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ disable = [`
`339`	`339`	`]`
`340`	`340`
`341`	`341`	`[tool.codespell]`
`342`		`-ignore-words-list = "afile,asend,asser,assertio,feld,hove,ned,noes,notin,paramete,parth,socio-economic,tesults,varius,wil"`
	`342`	`+ignore-words-list = "afile,asend,asser,assertio,feld,hove,ned,noes,notin,paramete,parth,tesults,varius,wil"`
`343`	`343`	`skip = "AUTHORS,*/plugin_list.rst"`
`344`	`344`	`write-changes = true`
`345`	`345`