13403: Disable assertion rewriting for external modules - eliminate os.getcwd

Author: Tusenka

src/_pytest/assertion/__init__.py

@@ -107,20 +107,14 @@ class AssertionState:
     def __init__(self, config: Config, mode) -> None:
         self.mode = mode
         self.trace = config.trace.root.get("assertion")
+        self.config=config
         self.hook: rewrite.AssertionRewritingHook | None = None
 
     @property
     def rootpath(self):
+        """Get current root path (current working dir)
         """
-        Get current root path (current working dir)
-        """
-        try:
-            return os.getcwd()
-        except FileNotFoundError:
-            # Fixes for py's trying to os.getcwd() on py34
-            # when current working directory doesn't exist (previously triggered via xdist only).
-            # Ref: https://github.com/pytest-dev/py/pull/207
-            return os.path.abspath(os.sep)
+        return str(self.config.invocation_params.dir)
 
 
 def install_importhook(config: Config) -> rewrite.AssertionRewritingHook:

src/_pytest/pytester.py

@@ -749,6 +749,11 @@ def chdir(self) -> None:
         This is done automatically upon instantiation.
         """
         self._monkeypatch.chdir(self.path)
+        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),
+        ))
 
     def _makefile(
         self,

testing/test_assertrewrite.py

@@ -1308,13 +1308,16 @@ def test_rootpath_base(self, pytester: Pytester, monkeypatch: MonkeyPatch) -> No
         from _pytest.assertion import AssertionState
 
         config = pytester.parseconfig()
-        monkeypatch.chdir(pytester.path)
         state = AssertionState(config, "rewrite")
-        assert state.rootpath == str(pytester.path)
-        new_rootpath = str(pytester.path) + "/test"
+        assert state.rootpath == str(config.invocation_params.dir)
+        new_rootpath =str(pytester.path / "test")
         if not os.path.exists(new_rootpath):
             os.mkdir(new_rootpath)
-        monkeypatch.chdir(new_rootpath)
+        monkeypatch.setattr(config,"invocation_params", Config.InvocationParams(
+            args= (),
+            plugins=(),
+            dir=Path(new_rootpath),
+        ))
         state = AssertionState(config, "rewrite")
         assert state.rootpath == new_rootpath
 
@@ -1324,20 +1327,6 @@ def test_rootpath_base(self, pytester: Pytester, monkeypatch: MonkeyPatch) -> No
     @pytest.mark.skipif(
         sys.platform.startswith("sunos5"), reason="cannot remove cwd on Solaris"
     )
-    def test_rootpath_cwd_removed(
-        self, pytester: Pytester, monkeypatch: MonkeyPatch
-    ) -> None:
-        # Setup conditions for py's trying to os.getcwd() on py34
-        # when current working directory doesn't exist (previously triggered via xdist only).
-        # Ref: https://github.com/pytest-dev/py/pull/207
-        from _pytest.assertion import AssertionState
-
-        config = pytester.parseconfig()
-        monkeypatch.setattr(
-            target=os, name="getcwd", value=Mock(side_effect=FileNotFoundError)
-        )
-        state = AssertionState(config, "rewrite")
-        assert state.rootpath == os.path.abspath(os.sep)
 
     def test_write_pyc(self, pytester: Pytester, tmp_path) -> None:
         from _pytest.assertion import AssertionState
@@ -2036,7 +2025,11 @@ def test_simple_failure():
         rootpath = f"{os.getcwd()}/tests"
         if not os.path.exists(rootpath):
             mkdir(rootpath)
-        monkeypatch.chdir(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("file") is None
 
@@ -2057,8 +2050,15 @@ def fix(): return 1
         rootpath = f"{os.getcwd()}/tests"
         if not os.path.exists(rootpath):
             mkdir(rootpath)
-        monkeypatch.chdir(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
 
@@ -2082,7 +2082,15 @@ def test_assert_rewrite_correct_for_plugins(
         rootpath = f"{os.getcwd()}/tests"
         if not os.path.exists(rootpath):
             mkdir(rootpath)
-        monkeypatch.chdir(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