Move TestRunner initialisation into unittest.TestProgram.runTests. Fixes issue 6418.

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 92a5fad85f6a8980cbb8b686775ff5a7b4b35162..29f897591a377c143a81ed5011988890fe94e026 100644 (file)
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -3324,15 +3324,6 @@ class Test_TestProgram(TestCase):
         self.assertEqual(runner.test, test)
         self.assertEqual(program.verbosity, 2)
 
-
-    def testTestProgram_testRunnerArgument(self):
-        program = object.__new__(TestProgram)
-        program.parseArgs = lambda _: None
-        program.runTests = lambda: None
-        program.__init__(testRunner=None)
-        self.assertEqual(program.testRunner, unittest.TextTestRunner)
-
-
     class FooBar(unittest.TestCase):
         def testPass(self):
             assert True

diff --git a/Lib/unittest.py b/Lib/unittest.py
index bf7baa11c81d2ccdbeeaba081fb636a2bc83fded..064429c4478ed20fc3c9e34705b9ac3531b3d3f1 100644 (file)
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -1643,8 +1643,6 @@ class TestProgram(object):
                  argv=None, testRunner=None,
                  testLoader=defaultTestLoader, exit=True,
                  verbosity=1):
-        if testRunner is None:
-            testRunner = TextTestRunner
         if isinstance(module, basestring):
             self.module = __import__(module)
             for part in module.split('.')[1:]:
@@ -1734,6 +1732,8 @@ class TestProgram(object):
         self.test = loader.discover(start_dir, pattern, top_level_dir)
 
     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)