From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Fri, 3 Dec 2010 19:20:44 +0000 (+0000)
Subject: Fix so that test.test_unittest can be executed by unittest and not just regrtest
X-Git-Tag: v3.2b1~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=add7cbfb0527aaa15879f5ea9aaf2c8b322f0868;p=thirdparty%2FPython%2Fcpython.git

Fix so that test.test_unittest can be executed by unittest and not just regrtest
---

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 7059c431634c..bfc3ded6f128 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()