gh-117089: Move importlib.metadata tests to their own package (#117092)

* Ensure importlib.metadata tests do not leak references in sys.modules.

* Move importlib.metadata tests to their own package for easier syncing with importlib_metadata.

* Update owners and makefile for new directories.

* Add blurb

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e8eed400d961fcbed2beb1777f529868d7862e7b..235bc78599400e4d347e99ff1956963a8ce242f3 100644 (file)
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -119,7 +119,7 @@ Python/dynload_*.c            @ericsnowcurrently
 Lib/test/test_module/         @ericsnowcurrently
 Doc/c-api/module.rst          @ericsnowcurrently
 **/*importlib/resources/*     @jaraco @warsaw @FFY00
-**/importlib/metadata/*       @jaraco @warsaw
+**/*importlib/metadata/*       @jaraco @warsaw
 
 # Dates and times
 **/*datetime*                 @pganssle @abalkin

diff --git a/Lib/test/test_importlib/data/__init__.py b/Lib/test/test_importlib/metadata/__init__.py
similarity index 100%
rename from Lib/test/test_importlib/data/__init__.py
rename to Lib/test/test_importlib/metadata/__init__.py

diff --git a/Lib/test/test_importlib/_context.py b/Lib/test/test_importlib/metadata/_context.py
similarity index 100%
rename from Lib/test/test_importlib/_context.py
rename to Lib/test/test_importlib/metadata/_context.py

diff --git a/Lib/test/test_importlib/_path.py b/Lib/test/test_importlib/metadata/_path.py
similarity index 100%
rename from Lib/test/test_importlib/_path.py
rename to Lib/test/test_importlib/metadata/_path.py

diff --git a/Lib/test/test_importlib/metadata/data/__init__.py b/Lib/test/test_importlib/metadata/data/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/Lib/test/test_importlib/data/example-21.12-py3-none-any.whl b/Lib/test/test_importlib/metadata/data/example-21.12-py3-none-any.whl
similarity index 100%
rename from Lib/test/test_importlib/data/example-21.12-py3-none-any.whl
rename to Lib/test/test_importlib/metadata/data/example-21.12-py3-none-any.whl

diff --git a/Lib/test/test_importlib/data/example-21.12-py3.6.egg b/Lib/test/test_importlib/metadata/data/example-21.12-py3.6.egg
similarity index 100%
rename from Lib/test/test_importlib/data/example-21.12-py3.6.egg
rename to Lib/test/test_importlib/metadata/data/example-21.12-py3.6.egg

diff --git a/Lib/test/test_importlib/data/example2-1.0.0-py3-none-any.whl b/Lib/test/test_importlib/metadata/data/example2-1.0.0-py3-none-any.whl
similarity index 100%
rename from Lib/test/test_importlib/data/example2-1.0.0-py3-none-any.whl
rename to Lib/test/test_importlib/metadata/data/example2-1.0.0-py3-none-any.whl

diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/metadata/fixtures.py
similarity index 98%
rename from Lib/test/test_importlib/fixtures.py
rename to Lib/test/test_importlib/metadata/fixtures.py
index 8c973356b5660d3ce134b7c4d25bb268009c2d43..f23ac5d9019d1718de0083b52f70306f1ef7c94d 100644 (file)
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/metadata/fixtures.py
@@ -9,6 +9,7 @@ import textwrap
 import functools
 import contextlib
 
+from test.support import import_helper
 from test.support.os_helper import FS_NONASCII
 from test.support import requires_zlib
 
@@ -85,6 +86,7 @@ class OnSysPath(Fixtures):
     def setUp(self):
         super().setUp()
         self.fixtures.enter_context(self.add_sys_path(self.site_dir))
+        self.fixtures.enter_context(import_helper.isolated_modules())
 
 
 class SiteBuilder(SiteDir):
@@ -348,7 +350,7 @@ def DALS(str):
 
 @requires_zlib()
 class ZipFixtures:
-    root = 'test.test_importlib.data'
+    root = 'test.test_importlib.metadata.data'
 
     def _fixture_on_path(self, filename):
         pkg_file = resources.files(self.root).joinpath(filename)

diff --git a/Lib/test/test_importlib/stubs.py b/Lib/test/test_importlib/metadata/stubs.py
similarity index 100%
rename from Lib/test/test_importlib/stubs.py
rename to Lib/test/test_importlib/metadata/stubs.py

diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/metadata/test_api.py
similarity index 100%
rename from Lib/test/test_importlib/test_metadata_api.py
rename to Lib/test/test_importlib/metadata/test_api.py

diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/metadata/test_main.py
similarity index 100%
rename from Lib/test/test_importlib/test_main.py
rename to Lib/test/test_importlib/metadata/test_main.py

diff --git a/Lib/test/test_importlib/test_zip.py b/Lib/test/test_importlib/metadata/test_zip.py
similarity index 100%
rename from Lib/test/test_importlib/test_zip.py
rename to Lib/test/test_importlib/metadata/test_zip.py

diff --git a/Makefile.pre.in b/Makefile.pre.in
index b9f790a14af4cd19fc2ee0aba5aa250f06dcf04a..1451cf3a31ff0214e76940b5dd8eb8a8e6cb07da 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -2351,10 +2351,11 @@ TESTSUBDIRS=    idlelib/idle_test \
                test/test_import/data/unwritable \
                test/test_importlib \
                test/test_importlib/builtin \
-               test/test_importlib/data \
                test/test_importlib/extension \
                test/test_importlib/frozen \
                test/test_importlib/import_ \
+               test/test_importlib/metadata \
+               test/test_importlib/metadata/data \
                test/test_importlib/namespace_pkgs \
                test/test_importlib/namespace_pkgs/both_portions \
                test/test_importlib/namespace_pkgs/both_portions/foo \

diff --git a/Misc/NEWS.d/next/Tests/2024-03-20-14-19-32.gh-issue-117089.WwR1Z1.rst b/Misc/NEWS.d/next/Tests/2024-03-20-14-19-32.gh-issue-117089.WwR1Z1.rst
new file mode 100644 (file)
index 0000000..ab0baec
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2024-03-20-14-19-32.gh-issue-117089.WwR1Z1.rst
@@ -0,0 +1 @@
+Consolidated tests for importlib.metadata in their own ``metadata`` package.