Issue #14585: test_import now runs all tests under

importlib.test.import_ using builtins.__import__() instead of just the
relative import tests.
This commit is contained in:
Brett Cannon 2012-04-20 15:52:17 -04:00
parent 3dfc22cc04
commit 1032af95ff
2 changed files with 35 additions and 15 deletions

View file

@ -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__':