summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_unittest.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2009-06-02 18:22:38 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2009-06-02 18:22:38 (GMT)
commit48bc8203cceb893e7e1d765350dedc8ba783f343 (patch)
tree91c3f8119a6a6d07056c36a2bd20adb35cf8b77f /Lib/test/test_unittest.py
parent05f26d88fd545d9057ca6a5f993862d1ba5850f7 (diff)
downloadcpython-48bc8203cceb893e7e1d765350dedc8ba783f343.zip
cpython-48bc8203cceb893e7e1d765350dedc8ba783f343.tar.gz
cpython-48bc8203cceb893e7e1d765350dedc8ba783f343.tar.bz2
Restore default testRunner argument in unittest.main to None. Issue 6177.
Diffstat (limited to 'Lib/test/test_unittest.py')
-rw-r--r--Lib/test/test_unittest.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 5a82780..c8fdc15 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2284,6 +2284,17 @@ class Test_Assertions(TestCase):
self.assertRaises(AssertionError,
self.failIfAlmostEqual, 0, .1+.1j, places=0)
+
+class Test_TestProgram(TestCase):
+
+ def testTestProgram_testRunnerArgument(self):
+ program = object.__new__(unittest.TestProgram)
+ program.parseArgs = lambda _: None
+ program.runTests = lambda: None
+ program.__init__(testRunner=None)
+ self.assertEqual(program.testRunner, unittest.TextTestRunner)
+
+
######################################################################
## Main
######################################################################
@@ -2291,7 +2302,7 @@ class Test_Assertions(TestCase):
def test_main():
test_support.run_unittest(Test_TestCase, Test_TestLoader,
Test_TestSuite, Test_TestResult, Test_FunctionTestCase,
- Test_Assertions)
+ Test_Assertions, Test_TestProgram)
if __name__ == "__main__":
test_main()