Merge pull request #11756 from SpecLad/setup-teardown

Replace deprecated setup/teardown usage

Author: pradyunsg

news/4e5ddb5b-e740-4ef8-a78a-8d62a144fdde.trivial.rst

@@ -17,7 +17,7 @@
 
 
 class ConfigurationMixin:
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.configuration = pip._internal.configuration.Configuration(
             isolated=False,
         )

tests/lib/configuration_helpers.py

@@ -22,12 +22,12 @@ def main(  # type: ignore[override]
 
 
 class AddFakeCommandMixin:
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         commands_dict["fake"] = CommandInfo(
             "tests.lib.options_helpers",
             "FakeCommand",
             "fake summary",
         )
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         commands_dict.pop("fake")

tests/lib/options_helpers.py

@@ -28,13 +28,13 @@ def _get_scheme_dict(*args: Any, **kwargs: Any) -> Dict[str, str]:
 
 
 class TestLocations:
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.tempdir = tempfile.mkdtemp()
         self.st_uid = 9999
         self.username = "example"
         self.patch()
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         self.revert_patch()
         shutil.rmtree(self.tempdir, ignore_errors=True)
 

tests/unit/test_locations.py

@@ -71,10 +71,10 @@ def get_processed_req_from_line(
 class TestRequirementSet:
     """RequirementSet tests"""
 
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.tempdir = tempfile.mkdtemp()
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         shutil.rmtree(self.tempdir, ignore_errors=True)
 
     @contextlib.contextmanager
@@ -507,10 +507,10 @@ def test_download_info_vcs(self) -> None:
 
 
 class TestInstallRequirement:
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.tempdir = tempfile.mkdtemp()
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         shutil.rmtree(self.tempdir, ignore_errors=True)
 
     def test_url_with_query(self) -> None:

tests/unit/test_req.py

@@ -52,7 +52,7 @@
 class Tests_EgglinkPath:
     "util.egg_link_path_from_location() tests"
 
-    def setup(self) -> None:
+    def setup_method(self) -> None:
 
         project = "foo"
 
@@ -81,7 +81,7 @@ def setup(self) -> None:
         self.old_isfile = path.isfile
         self.mock_isfile = path.isfile = Mock()
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         from pip._internal.utils import egg_link as utils
 
         utils.site_packages = self.old_site_packages

tests/unit/test_utils.py

@@ -37,12 +37,12 @@ class TestUnpackArchives:
 
     """
 
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.tempdir = tempfile.mkdtemp()
         self.old_mask = os.umask(0o022)
         self.symlink_expected_mode = None
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         os.umask(self.old_mask)
         shutil.rmtree(self.tempdir, ignore_errors=True)