summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-12-03 19:20:44 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-12-03 19:20:44 (GMT)
commitadd7cbfb0527aaa15879f5ea9aaf2c8b322f0868 (patch)
treee331aa1e6744036e7a9f62c4909effb97bf112f1 /Lib/test
parenta9c7a8fa5bded740bba314cb07ebd3c99eba928e (diff)
downloadcpython-add7cbfb0527aaa15879f5ea9aaf2c8b322f0868.zip
cpython-add7cbfb0527aaa15879f5ea9aaf2c8b322f0868.tar.gz
cpython-add7cbfb0527aaa15879f5ea9aaf2c8b322f0868.tar.bz2
Fix so that test.test_unittest can be executed by unittest and not just regrtest
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_unittest.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 7059c43..bfc3ded 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -4,8 +4,13 @@ from test import support
def test_main():
+ # used by regrtest
support.run_unittest(unittest.test.suite())
support.reap_children()
+def load_tests(*_):
+ # used by unittest
+ return unittest.test.suite()
+
if __name__ == "__main__":
test_main()