traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

(cherry picked from commit ac1ee1bada)

Co-authored-by: Barry Warsaw <barry@python.org>
This commit is contained in:
Miss Islington (bot) 2018-06-05 12:11:40 -07:00 committed by Barry Warsaw
parent 1d419faccd
commit e135032ffa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_importlib/test_resource.py
View File

@ -2,7 +2,7 @@ import sys
import unittest import unittest
from . import data01 from . import data01
from . import zipdata02 from . import zipdata01, zipdata02
from . import util from . import util
from importlib import resources, import_module from importlib import resources, import_module
@ -109,6 +109,10 @@ class ResourceFromZipsTest(util.ZipSetupBase, unittest.TestCase):
set(resources.contents('ziptestdata.two')), set(resources.contents('ziptestdata.two')),
{'__init__.py', 'resource2.txt'}) {'__init__.py', 'resource2.txt'})
class SubdirectoryResourceFromZipsTest(util.ZipSetupBase, unittest.TestCase):
ZIP_MODULE = zipdata01 # type: ignore
def test_is_submodule_resource(self): def test_is_submodule_resource(self):
submodule = import_module('ziptestdata.subdirectory') submodule = import_module('ziptestdata.subdirectory')
self.assertTrue( self.assertTrue(

4
Lib/test/test_importlib/util.py
View File

@ -549,6 +549,10 @@ class ZipSetupBase:
except AttributeError: except AttributeError:
pass pass
def setUp(self):
modules = support.modules_setup()
self.addCleanup(support.modules_cleanup, *modules)
class ZipSetup(ZipSetupBase): class ZipSetup(ZipSetupBase):
ZIP_MODULE = zipdata01 # type: ignore ZIP_MODULE = zipdata01 # type: ignore