pytester: remove special handling of env during inner runs

Closes https://github.com/pytest-dev/pytest/issues/6213.

1 files changed, 9 insertions, 15 deletions

diff --git a/testing/test_pytester.py b/testing/test_pytester.py
index 5bdbacdd0..3dab13b4b 100644
--- a/testing/test_pytester.py
+++ b/testing/test_pytester.py
@@ -550,17 +550,15 @@ def test_no_matching_after_match():
     assert str(e.value).splitlines() == ["fnmatch: '*'", "   with: '1'"]
 
 
-def test_pytester_addopts(request, monkeypatch):
+def test_pytester_addopts_before_testdir(request, monkeypatch):
+    orig = os.environ.get("PYTEST_ADDOPTS", None)
     monkeypatch.setenv("PYTEST_ADDOPTS", "--orig-unused")
-
     testdir = request.getfixturevalue("testdir")
-
-    try:
-        assert "PYTEST_ADDOPTS" not in os.environ
-    finally:
-        testdir.finalize()
-
-    assert os.environ["PYTEST_ADDOPTS"] == "--orig-unused"
+    assert "PYTEST_ADDOPTS" not in os.environ
+    testdir.finalize()
+    assert os.environ.get("PYTEST_ADDOPTS") == "--orig-unused"
+    monkeypatch.undo()
+    assert os.environ.get("PYTEST_ADDOPTS") == orig
 
 
 def test_run_stdin(testdir):
@@ -640,14 +638,10 @@ def test_popen_default_stdin_stderr_and_stdin_None(testdir):
 
 
 def test_spawn_uses_tmphome(testdir):
-    import os
-
     tmphome = str(testdir.tmpdir)
+    assert os.environ.get("HOME") == tmphome
 
-    # Does use HOME only during run.
-    assert os.environ.get("HOME") != tmphome
-
-    testdir._env_run_update["CUSTOMENV"] = "42"
+    testdir.monkeypatch.setenv("CUSTOMENV", "42")
 
     p1 = testdir.makepyfile(
         """