diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-07-23 17:06:47 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-07-23 17:06:47 (GMT) |
| commit | f886697659a6ce9541bfc271d34929f3b225243e (patch) | |
| tree | db3f5ecab45ee4ab5c81eeda74d8bb82d33fd6d3 /Lib/test/test_importlib/extension | |
| parent | b848944d728faf9a5e6f4424a5c270734cbe4ce8 (diff) | |
| parent | f012ba42fe54253378a2784aaf7177aa36be579a (diff) | |
| download | cpython-f886697659a6ce9541bfc271d34929f3b225243e.zip cpython-f886697659a6ce9541bfc271d34929f3b225243e.tar.gz cpython-f886697659a6ce9541bfc271d34929f3b225243e.tar.bz2 | |
Closes #22002: Merge with 3.4
Diffstat (limited to 'Lib/test/test_importlib/extension')
| -rw-r--r-- | Lib/test/test_importlib/extension/__init__.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_importlib/extension/__main__.py | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Lib/test/test_importlib/extension/__init__.py b/Lib/test/test_importlib/extension/__init__.py index c033923..4b16ecc 100644 --- a/Lib/test/test_importlib/extension/__init__.py +++ b/Lib/test/test_importlib/extension/__init__.py @@ -1,13 +1,5 @@ -from .. import test_suite -import os.path -import unittest +import os +from test.support import load_package_tests - -def test_suite(): - directory = os.path.dirname(__file__) - return test_suite('importlib.test.extension', directory) - - -if __name__ == '__main__': - from test.support import run_unittest - run_unittest(test_suite()) +def load_tests(*args): + return load_package_tests(os.path.dirname(__file__), *args) diff --git a/Lib/test/test_importlib/extension/__main__.py b/Lib/test/test_importlib/extension/__main__.py new file mode 100644 index 0000000..40a23a2 --- /dev/null +++ b/Lib/test/test_importlib/extension/__main__.py @@ -0,0 +1,4 @@ +from . import load_tests +import unittest + +unittest.main() |