bpo-33755: Fix importlib.resources isolation tests (GH-7412) (#7434)

(cherry picked from commit ac1ee1badade69d5cd6d8b9112281f121183e7c0)

Co-authored-by: Barry Warsaw <barry@python.org>

diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/test_resource.py
index b07686032e04c99a59fd465563e1182832a590dc..f88d92d154672958227b739ba2218e731f151cf1 100644 (file)
--- a/Lib/test/test_importlib/test_resource.py
+++ b/Lib/test/test_importlib/test_resource.py
@@ -2,7 +2,7 @@ import sys
 import unittest
 
 from . import data01
-from . import zipdata02
+from . import zipdata01, zipdata02
 from . import util
 from importlib import resources, import_module
 
@@ -109,6 +109,10 @@ class ResourceFromZipsTest(util.ZipSetupBase, unittest.TestCase):
             set(resources.contents('ziptestdata.two')),
             {'__init__.py', 'resource2.txt'})
 
+
+class SubdirectoryResourceFromZipsTest(util.ZipSetupBase, unittest.TestCase):
+    ZIP_MODULE = zipdata01                          # type: ignore
+
     def test_is_submodule_resource(self):
         submodule = import_module('ziptestdata.subdirectory')
         self.assertTrue(

diff --git a/Lib/test/test_importlib/util.py b/Lib/test/test_importlib/util.py
index 7b07b046a5886ceefd09d9a6545dae13669ac7f0..b0badebc2b8c000da574aac36a3ee3a62d0546a3 100644 (file)
--- a/Lib/test/test_importlib/util.py
+++ b/Lib/test/test_importlib/util.py
@@ -549,6 +549,10 @@ class ZipSetupBase:
         except AttributeError:
             pass
 
+    def setUp(self):
+        modules = support.modules_setup()
+        self.addCleanup(support.modules_cleanup, *modules)
+
 
 class ZipSetup(ZipSetupBase):
     ZIP_MODULE = zipdata01                          # type: ignore