diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/importlib/test/__init__.py | 25 | ||||
| -rw-r--r-- | Lib/test/test_import.py | 25 |
2 files changed, 35 insertions, 15 deletions
diff --git a/Lib/importlib/test/__init__.py b/Lib/importlib/test/__init__.py index e69de29..815a706 100644 --- a/Lib/importlib/test/__init__.py +++ b/Lib/importlib/test/__init__.py @@ -0,0 +1,25 @@ +import os +import sys +import unittest + +def test_suite(package=__package__, directory=os.path.dirname(__file__)): + suite = unittest.TestSuite() + for name in os.listdir(directory): + if name.startswith(('.', '__')): + continue + path = os.path.join(directory, name) + if (os.path.isfile(path) and name.startswith('test_') and + name.endswith('.py')): + submodule_name = os.path.splitext(name)[0] + module_name = "{0}.{1}".format(package, submodule_name) + __import__(module_name, level=0) + module_tests = unittest.findTestCases(sys.modules[module_name]) + suite.addTest(module_tests) + elif os.path.isdir(path): + package_name = "{0}.{1}".format(package, name) + __import__(package_name, level=0) + package_tests = getattr(sys.modules[package_name], 'test_suite')() + suite.addTest(package_tests) + else: + continue + return suite diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index 8510eb8..f02681a 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -1,6 +1,6 @@ import builtins import imp -from importlib.test.import_ import test_relative_imports +from importlib.test.import_ import test_suite as importlib_import_test_suite from importlib.test.import_ import util as importlib_util import importlib import marshal @@ -694,21 +694,16 @@ class PycacheTests(unittest.TestCase): self.assertEqual(m.x, 5) -class RelativeImportFromImportlibTests(test_relative_imports.RelativeImports): - - def setUp(self): - self._importlib_util_flag = importlib_util.using___import__ - importlib_util.using___import__ = True - - def tearDown(self): - importlib_util.using___import__ = self._importlib_util_flag - - def test_main(verbose=None): - run_unittest(ImportTests, PycacheTests, - PycRewritingTests, PathsTests, RelativeImportTests, - OverridingImportBuiltinTests, - RelativeImportFromImportlibTests) + flag = importlib_util.using___import__ + try: + importlib_util.using___import__ = True + run_unittest(ImportTests, PycacheTests, + PycRewritingTests, PathsTests, RelativeImportTests, + OverridingImportBuiltinTests, + importlib_import_test_suite()) + finally: + importlib_util.using___import__ = flag if __name__ == '__main__': |