Merge pull request #2487 from yan12125/fix-tests-pytest-6.2

Fix tests with pytest 6.2
pypa · Dec 20, 2020 · 30b66d8 · 30b66d8
2 parents f8096a1 + 701eee9
commit 30b66d8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/changelog.d/2487.misc.rst b/changelog.d/2487.misc.rst
@@ -0,0 +1,2 @@
+ Fix tests with pytest 6.2
+-- by :user:`yan12125`
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
@@ -773,7 +773,7 @@ class TestNamespaces:
 
     ns_str = "__import__('pkg_resources').declare_namespace(__name__)\n"
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def symlinked_tmpdir(self, tmpdir):
         """
         Where available, return the tempdir as a symlink,
@@ -791,7 +791,7 @@ def symlinked_tmpdir(self, tmpdir):
         finally:
             os.unlink(link_name)
 
-    @pytest.yield_fixture(autouse=True)
+    @pytest.fixture(autouse=True)
     def patched_path(self, tmpdir):
         """
         Patch sys.path to include the 'site-pkgs' dir. Also

diff --git a/setuptools/tests/fixtures.py b/setuptools/tests/fixtures.py
@@ -3,7 +3,7 @@
 from . import contexts
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def user_override(monkeypatch):
     """
     Override site.USER_BASE and site.USER_SITE with temporary directories in
@@ -17,7 +17,7 @@ def user_override(monkeypatch):
                 yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def tmpdir_cwd(tmpdir):
     with tmpdir.as_cwd() as orig:
         yield orig
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
@@ -31,7 +31,7 @@
 """
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def temp_user(monkeypatch):
     with contexts.tempdir() as user_base:
         with contexts.tempdir() as user_site:
@@ -40,7 +40,7 @@ def temp_user(monkeypatch):
             yield
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def test_env(tmpdir, temp_user):
     target = tmpdir
     foo = target.mkdir('foo')

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
@@ -305,7 +305,7 @@ def test_add_from_site_is_ignored(self):
         assert not pth.dirty
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def setup_context(tmpdir):
     with (tmpdir / 'setup.py').open('w') as f:
         f.write(SETUP_PY)
@@ -361,7 +361,7 @@ def foo_package(self, tmpdir):
             f.write('Name: foo\n')
         return str(tmpdir)
 
-    @pytest.yield_fixture()
+    @pytest.fixture()
     def install_target(self, tmpdir):
         target = str(tmpdir)
         with mock.patch('sys.path', sys.path + [target]):
@@ -406,7 +406,7 @@ def patched_setup_context(self):
         )
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def distutils_package():
     distutils_setup_py = SETUP_PY.replace(
         'from setuptools import setup',

diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
@@ -45,7 +45,7 @@ def run():
                 """)
         })
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def env(self):
         with contexts.tempdir(prefix='setuptools-test.') as env_dir:
             env = Environment(env_dir)

diff --git a/setuptools/tests/test_msvc.py b/setuptools/tests/test_msvc.py
@@ -88,7 +88,7 @@ def test_no_registry_entries_means_nothing_found(self):
                     assert isinstance(exc, expected)
                     assert 'aka.ms/vcpython27' in str(exc)
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def user_preferred_setting(self):
         """
         Set up environment with different install dirs for user vs. system
@@ -116,7 +116,7 @@ def test_prefer_current_user(self, user_preferred_setting):
         expected = os.path.join(user_preferred_setting, 'vcvarsall.bat')
         assert expected == result
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def local_machine_setting(self):
         """
         Set up environment with only the system environment configured.
@@ -138,7 +138,7 @@ def test_local_machine_recognized(self, local_machine_setting):
         expected = os.path.join(local_machine_setting, 'vcvarsall.bat')
         assert expected == result
 
-    @pytest.yield_fixture
+    @pytest.fixture
     def x64_preferred_setting(self):
         """
         Set up environment with 64-bit and 32-bit system settings configured

diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
@@ -5,7 +5,6 @@
 import pathlib
 
 import pytest
-from pytest import yield_fixture
 from pytest_fixture_config import yield_requires_config
 
 import pytest_virtualenv
@@ -29,7 +28,7 @@ def pytest_virtualenv_works(virtualenv):
 
 
 @yield_requires_config(pytest_virtualenv.CONFIG, ['virtualenv_executable'])
-@yield_fixture(scope='function')
+@pytest.fixture(scope='function')
 def bare_virtualenv():
     """ Bare virtualenv (no pip/setuptools/wheel).
     """