mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move test_import over to unittest.main().

This commit is contained in:
Brett Cannon 2013-07-04 18:03:57 -04:00
parent 679ecb565b
commit fc4b5b9a42
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/test/test_import.py
View File

@ -68,8 +68,6 @@ def setUp(self):
def tearDown(self): def tearDown(self):
unload(TESTFN) unload(TESTFN)
setUp = tearDown
def test_case_sensitivity(self): def test_case_sensitivity(self):
# Brief digression to test that import is case-sensitive: if we got # Brief digression to test that import is case-sensitive: if we got
# this far, we know for sure that "random" exists. # this far, we know for sure that "random" exists.
@ -487,7 +485,7 @@ def test_foreign_code(self):
header = f.read(12) header = f.read(12)
code = marshal.load(f) code = marshal.load(f)
constants = list(code.co_consts) constants = list(code.co_consts)
foreign_code = test_main.__code__ foreign_code = importlib.import_module.__code__
pos = constants.index(1) pos = constants.index(1)
constants[pos] = foreign_code constants[pos] = foreign_code
code = type(code)(code.co_argcount, code.co_kwonlyargcount, code = type(code)(code.co_argcount, code.co_kwonlyargcount,
@ -1013,16 +1011,6 @@ def load_module(*args):
importlib.SourceLoader.load_module = old_load_module importlib.SourceLoader.load_module = old_load_module
def test_main(verbose=None):
run_unittest(ImportTests, PycacheTests, FilePermissionTests,
PycRewritingTests, PathsTests, RelativeImportTests,
OverridingImportBuiltinTests,
ImportlibBootstrapTests,
TestSymbolicallyLinkedPackage,
ImportTracebackTests)
if __name__ == '__main__': if __name__ == '__main__':
# Test needs to be a package, so we can do relative imports. # Test needs to be a package, so we can do relative imports.
from test.test_import import test_main unittest.main()
test_main()