summaryrefslogtreecommitdiff
path: root/Lib/test/test_unittest.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-12-03 19:20:44 +0000
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-12-03 19:20:44 +0000
commitebe067ce303ab8b1496caeb8c4d8f9ccd646cbf5 (patch)
tree73015a83e48eb6ef44a1b945300f9df6958ce0a8 /Lib/test/test_unittest.py
parent1ab618e86f01b6906c93bde4c1bcb0ffcb1e5087 (diff)
downloadcpython-ebe067ce303ab8b1496caeb8c4d8f9ccd646cbf5.tar.gz
Fix so that test.test_unittest can be executed by unittest and not just regrtest
Diffstat (limited to 'Lib/test/test_unittest.py')
-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 7059c43163..bfc3ded6f1 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()