From 48bc8203cceb893e7e1d765350dedc8ba783f343 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Tue, 2 Jun 2009 18:22:38 +0000 Subject: [PATCH] Restore default testRunner argument in unittest.main to None. Issue 6177. --- Lib/test/test_unittest.py | 13 ++++++++++++- Lib/unittest.py | 4 +++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 5a827805b1..c8fdc15d39 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() diff --git a/Lib/unittest.py b/Lib/unittest.py index 09c6ca97c8..2ad5de781b 100644 --- a/Lib/unittest.py +++ b/Lib/unittest.py @@ -798,8 +798,10 @@ Examples: in MyTestCase """ def __init__(self, module='__main__', defaultTest=None, - argv=None, testRunner=TextTestRunner, + argv=None, testRunner=None, testLoader=defaultTestLoader): + if testRunner is None: + testRunner = TextTestRunner if type(module) == type(''): self.module = __import__(module) for part in module.split('.')[1:]: -- 2.50.1