13403: Disable assertion rewriting for external modules - add tests

Author: Tusenka

src/_pytest/pytester.py

@@ -12,6 +12,7 @@
 from collections.abc import Iterable
 from collections.abc import Sequence
 import contextlib
+import dataclasses
 from fnmatch import fnmatch
 import gc
 import importlib
@@ -752,10 +753,8 @@ def chdir(self) -> None:
         self._monkeypatch.setattr(
             self._request.config,
             "invocation_params",
-            Config.InvocationParams(
-                args=self._request.config.invocation_params.args,
-                plugins=self._request.config.invocation_params.plugins,
-                dir=Path(self._path),
+            dataclasses.replace(
+                self._request.config.invocation_params, dir=Path(self._path)
             ),
         )
 

testing/example_scripts/rewrite/src/main.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
 
-def func(x: int, y: int):
-    assert x > 0
-    assert y > 0
+def func(x: int, y: int) -> int:
     return 0 if x == y else 1 if x > y else -1

testing/test_assertrewrite.py

@@ -2032,63 +2032,6 @@ def test_simple_failure():
         with mock.patch.object(hook, "fnpats", ["*.py"]):
             assert hook.find_spec("file") is None
 
-    def test_assert_rewrite_correct_for_conftfest(
-        self, pytester: Pytester, hook: AssertionRewritingHook, monkeypatch
-    ) -> None:
-        """Conftest is always rewritten regardless of the root dir"""
-        pytester.makeconftest(
-            """
-            import pytest
-            @pytest.fixture
-            def fix(): return 1
-        """
-        )
-
-        rootpath = f"{os.getcwd()}/tests"
-        if not os.path.exists(rootpath):
-            mkdir(rootpath)
-        monkeypatch.setattr(
-            pytester._request.config,
-            "invocation_params",
-            Config.InvocationParams(
-                args=(),
-                plugins=(),
-                dir=Path(rootpath),
-            ),
-        )
-        with mock.patch.object(hook, "fnpats", ["*.py"]):
-            assert hook.find_spec("conftest") is not None
-
-    def test_assert_rewrite_correct_for_plugins(
-        self, pytester: Pytester, hook: AssertionRewritingHook, monkeypatch
-    ) -> None:
-        """Plugins has always been rewritten regardless of the root dir"""
-        pkgdir = pytester.mkpydir("plugin")
-        pkgdir.joinpath("__init__.py").write_text(
-            "import pytest\n"
-            "@pytest.fixture\n"
-            "def special_asserter():\n"
-            "    def special_assert(x, y):\n"
-            "        assert x == y\n"
-            "    return special_assert\n",
-            encoding="utf-8",
-        )
-        hook.mark_rewrite("plugin")
-        rootpath = f"{os.getcwd()}/tests"
-        if not os.path.exists(rootpath):
-            mkdir(rootpath)
-        monkeypatch.setattr(
-            pytester._request.config,
-            "invocation_params",
-            Config.InvocationParams(
-                args=(),
-                plugins=(),
-                dir=Path(rootpath),
-            ),
-        )
-        with mock.patch.object(hook, "fnpats", ["*.py"]):
-            assert hook.find_spec("plugin") is not None
-
     @pytest.mark.skipif(
         sys.platform.startswith("win32"), reason="cannot remove cwd on Windows"
     )