Skip to content

Commit 8ad8898

Browse files
authored
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
1 parent 7d44654 commit 8ad8898

15 files changed

+7
-3
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Python/dynload_*.c @ericsnowcurrently
119119
Lib/test/test_module/ @ericsnowcurrently
120120
Doc/c-api/module.rst @ericsnowcurrently
121121
**/*importlib/resources/* @jaraco @warsaw @FFY00
122-
**/importlib/metadata/* @jaraco @warsaw
122+
**/*importlib/metadata/* @jaraco @warsaw
123123

124124
# Dates and times
125125
**/*datetime* @pganssle @abalkin

Lib/test/test_importlib/metadata/data/__init__.py

Whitespace-only changes.

Lib/test/test_importlib/fixtures.py renamed to Lib/test/test_importlib/metadata/fixtures.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import functools
1010
import contextlib
1111

12+
from test.support import import_helper
1213
from test.support.os_helper import FS_NONASCII
1314
from test.support import requires_zlib
1415

@@ -85,6 +86,7 @@ def add_sys_path(dir):
8586
def setUp(self):
8687
super().setUp()
8788
self.fixtures.enter_context(self.add_sys_path(self.site_dir))
89+
self.fixtures.enter_context(import_helper.isolated_modules())
8890

8991

9092
class SiteBuilder(SiteDir):
@@ -348,7 +350,7 @@ def DALS(str):
348350

349351
@requires_zlib()
350352
class ZipFixtures:
351-
root = 'test.test_importlib.data'
353+
root = 'test.test_importlib.metadata.data'
352354

353355
def _fixture_on_path(self, filename):
354356
pkg_file = resources.files(self.root).joinpath(filename)

Makefile.pre.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,10 +2351,11 @@ TESTSUBDIRS= idlelib/idle_test \
23512351
test/test_import/data/unwritable \
23522352
test/test_importlib \
23532353
test/test_importlib/builtin \
2354-
test/test_importlib/data \
23552354
test/test_importlib/extension \
23562355
test/test_importlib/frozen \
23572356
test/test_importlib/import_ \
2357+
test/test_importlib/metadata \
2358+
test/test_importlib/metadata/data \
23582359
test/test_importlib/namespace_pkgs \
23592360
test/test_importlib/namespace_pkgs/both_portions \
23602361
test/test_importlib/namespace_pkgs/both_portions/foo \
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Consolidated tests for importlib.metadata in their own ``metadata`` package.

0 commit comments

Comments
 (0)