[Python-checkins] bpo-33755: Fix importlib.resources isolation tests (#7412)

Tue Jun 5 12:40:49 EDT 2018

https://github.com/python/cpython/commit/ac1ee1badade69d5cd6d8b9112281f121183e7c0
commit: ac1ee1badade69d5cd6d8b9112281f121183e7c0
branch: master
author: Barry Warsaw <barry at python.org>
committer: GitHub <noreply at github.com>
date: 2018年06月05日T09:40:45-07:00
summary:
bpo-33755: Fix importlib.resources isolation tests (#7412)
files:
M Lib/test/test_importlib/test_resource.py
M Lib/test/test_importlib/util.py

diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/test_resource.py
index b07686032e04..f88d92d15467 100644
--- a/Lib/test/test_importlib/test_resource.py
+++ b/Lib/test/test_importlib/test_resource.py
@@ -2,7 +2,7 @@
 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 @@ def test_unrelated_contents(self):
 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 7b07b046a588..b0badebc2b8c 100644
--- a/Lib/test/test_importlib/util.py
+++ b/Lib/test/test_importlib/util.py
@@ -549,6 +549,10 @@ def tearDownClass(cls):
 except AttributeError:
 pass
 
+ def setUp(self):
+ modules = support.modules_setup()
+ self.addCleanup(support.modules_cleanup, *modules)
+
 
 class ZipSetup(ZipSetupBase):
 ZIP_MODULE = zipdata01 # type: ignore
