[Python-checkins] r73152 - in python/branches/release26-maint/Lib: test/test_unittest.py unittest.py

Tue Jun 2 20:22:38 CEST 2009

Author: michael.foord
Date: Tue Jun 2 20:22:38 2009
New Revision: 73152
Log:
Restore default testRunner argument in unittest.main to None. Issue 6177.
Modified:
 python/branches/release26-maint/Lib/test/test_unittest.py
 python/branches/release26-maint/Lib/unittest.py
Modified: python/branches/release26-maint/Lib/test/test_unittest.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_unittest.py	(original)
+++ python/branches/release26-maint/Lib/test/test_unittest.py	Tue Jun 2 20:22:38 2009
@@ -2284,6 +2284,17 @@
 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 @@
 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()
Modified: python/branches/release26-maint/Lib/unittest.py
==============================================================================
--- python/branches/release26-maint/Lib/unittest.py	(original)
+++ python/branches/release26-maint/Lib/unittest.py	Tue Jun 2 20:22:38 2009
@@ -798,8 +798,10 @@
 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:]:
