(original) (raw)

changeset: 86624:becc0a488189 user: Brett Cannon brett@python.org date: Fri Oct 25 12:33:59 2013 -0400 files: Lib/test/test_importlib/abc.py Lib/test/test_importlib/builtin/test_finder.py Lib/test/test_importlib/builtin/test_loader.py Lib/test/test_importlib/extension/test_finder.py Lib/test/test_importlib/extension/test_loader.py Lib/test/test_importlib/frozen/test_finder.py Lib/test/test_importlib/frozen/test_loader.py Lib/test/test_importlib/source/test_file_loader.py Lib/test/test_importlib/source/test_finder.py description: Issue #16803: Stop having test.test_importlib.abc ABCs inherit from unittest.TestCase in prep of running tests under frozen and source importlib. diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/abc.py --- a/Lib/test/test_importlib/abc.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/abc.py Fri Oct 25 12:33:59 2013 -0400 @@ -2,7 +2,7 @@ import unittest -class FinderTests(unittest.TestCase, metaclass=abc.ABCMeta): +class FinderTests(metaclass=abc.ABCMeta): """Basic tests for a finder to pass.""" @@ -39,7 +39,7 @@ pass -class LoaderTests(unittest.TestCase, metaclass=abc.ABCMeta): +class LoaderTests(metaclass=abc.ABCMeta): @abc.abstractmethod def test_module(self): diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/builtin/test_finder.py --- a/Lib/test/test_importlib/builtin/test_finder.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/builtin/test_finder.py Fri Oct 25 12:33:59 2013 -0400 @@ -6,7 +6,7 @@ import sys import unittest -class FinderTests(abc.FinderTests): +class FinderTests(unittest.TestCase, abc.FinderTests): """Test find_module() for built-in modules.""" @@ -46,10 +46,5 @@ -def test_main(): - from test.support import run_unittest - run_unittest(FinderTests) - - if __name__ == '__main__': - test_main() + unittest.main() diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/builtin/test_loader.py --- a/Lib/test/test_importlib/builtin/test_loader.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/builtin/test_loader.py Fri Oct 25 12:33:59 2013 -0400 @@ -9,7 +9,7 @@ import unittest -class LoaderTests(abc.LoaderTests): +class LoaderTests(unittest.TestCase, abc.LoaderTests): """Test load_module() for built-in modules.""" diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/extension/test_finder.py --- a/Lib/test/test_importlib/extension/test_finder.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/extension/test_finder.py Fri Oct 25 12:33:59 2013 -0400 @@ -4,7 +4,7 @@ import unittest -class FinderTests(abc.FinderTests): +class FinderTests(unittest.TestCase, abc.FinderTests): """Test the finder for extension modules.""" diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/extension/test_loader.py --- a/Lib/test/test_importlib/extension/test_loader.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/extension/test_loader.py Fri Oct 25 12:33:59 2013 -0400 @@ -8,7 +8,7 @@ import unittest -class LoaderTests(abc.LoaderTests): +class LoaderTests(unittest.TestCase, abc.LoaderTests): """Test load_module() for extension modules.""" diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/frozen/test_finder.py --- a/Lib/test/test_importlib/frozen/test_finder.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/frozen/test_finder.py Fri Oct 25 12:33:59 2013 -0400 @@ -4,7 +4,7 @@ import unittest -class FinderTests(abc.FinderTests): +class FinderTests(unittest.TestCase, abc.FinderTests): """Test finding frozen modules.""" diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/frozen/test_loader.py --- a/Lib/test/test_importlib/frozen/test_loader.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/frozen/test_loader.py Fri Oct 25 12:33:59 2013 -0400 @@ -7,7 +7,7 @@ import types -class LoaderTests(abc.LoaderTests): +class LoaderTests(unittest.TestCase, abc.LoaderTests): def test_module(self): with util.uncache('__hello__'), captured_stdout() as stdout: diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/source/test_file_loader.py --- a/Lib/test/test_importlib/source/test_file_loader.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/source/test_file_loader.py Fri Oct 25 12:33:59 2013 -0400 @@ -19,7 +19,7 @@ from test.support import make_legacy_pyc, unload -class SimpleTest(unittest.TestCase): +class SimpleTest(unittest.TestCase, abc.LoaderTests): """Should have no issue importing a source module [basic]. And if there is a syntax error, it should raise a SyntaxError [syntax error]. @@ -177,6 +177,11 @@ # The pyc file was created. os.stat(compiled) + def test_unloadable(self): + loader = machinery.SourceFileLoader('good name', {}) + with self.assertRaises(ImportError): + loader.load_module('bad name') + class BadBytecodeTest(unittest.TestCase): diff -r eb1edc9e3722 -r becc0a488189 Lib/test/test_importlib/source/test_finder.py --- a/Lib/test/test_importlib/source/test_finder.py Fri Oct 25 17:56:00 2013 +0200 +++ b/Lib/test/test_importlib/source/test_finder.py Fri Oct 25 12:33:59 2013 -0400 @@ -13,7 +13,7 @@ import warnings -class FinderTests(abc.FinderTests): +class FinderTests(unittest.TestCase, abc.FinderTests): """For a top-level module, it should just be found directly in the directory being searched. This is true for a directory with source /brett@python.org