summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-10-29 17:28:13 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-10-29 17:28:13 (GMT)
commit0f26a3a8c9fa9e813c43ea414ea6df575b1ee4c4 (patch)
treea12798c61484c6060207142d54054e998dac98cb /Lib/test
parent55e614a2a8cc5b7a5af5795f87349ce3bf98fe84 (diff)
parent2acbae80165390a5be3bb12351147b8026787e13 (diff)
downloadcpython-0f26a3a8c9fa9e813c43ea414ea6df575b1ee4c4.zip
cpython-0f26a3a8c9fa9e813c43ea414ea6df575b1ee4c4.tar.gz
cpython-0f26a3a8c9fa9e813c43ea414ea6df575b1ee4c4.tar.bz2
Closes #22173: Merge with 3.4
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_lib2to3.py21
1 files changed, 2 insertions, 19 deletions
diff --git a/Lib/test/test_lib2to3.py b/Lib/test/test_lib2to3.py
index df4c37b..5eaa516 100644
--- a/Lib/test/test_lib2to3.py
+++ b/Lib/test/test_lib2to3.py
@@ -1,22 +1,5 @@
-# Skipping test_parser and test_all_fixers
-# because of running
-from lib2to3.tests import (test_fixers, test_pytree, test_util, test_refactor,
- test_parser,
- test_main as test_main_)
+from lib2to3.tests import load_tests
import unittest
-from test.support import run_unittest
-
-def suite():
- tests = unittest.TestSuite()
- loader = unittest.TestLoader()
- for m in (test_fixers, test_pytree, test_util, test_refactor, test_parser,
- test_main_):
- tests.addTests(loader.loadTestsFromModule(m))
- return tests
-
-def test_main():
- run_unittest(suite())
-
if __name__ == '__main__':
- test_main()
+ unittest.main()