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

[michael.foord]

Author: michael.foord
Date: Mon Jul 13 18:32:47 2009
New Revision: 73997

Log:
Move initialising unittest.TestProgram.testRunner into runTests. Issue 6418.

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	Mon Jul 13 18:32:47 2009
@@ -6,6 +6,7 @@
     TestCase.{assert,fail}* methods (some are tested implicitly)
 """
 
+import sys
 from test import test_support
 import unittest
 from unittest import TestCase
@@ -2285,15 +2286,6 @@
                           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
@@ -2302,7 +2294,7 @@
 def test_main():
     test_support.run_unittest(Test_TestCase, Test_TestLoader,
         Test_TestSuite, Test_TestResult, Test_FunctionTestCase,
-        Test_Assertions, Test_TestProgram)
+        Test_Assertions)
 
 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	Mon Jul 13 18:32:47 2009
@@ -800,8 +800,6 @@
     def __init__(self, module='__main__', defaultTest=None,
                  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:]:
@@ -851,6 +849,9 @@
                                                        self.module)
 
     def runTests(self):
+        if self.testRunner is None:
+            self.testRunner = TextTestRunner
+
         if isinstance(self.testRunner, (type, types.ClassType)):
             try:
                 testRunner = self.testRunner(verbosity=self.verbosity)