commit 91dcd93bebcf974d12a300e6a8d0fc6eb9891884
author Michael Foord <fuzzyman@voidspace.org.uk> Tue Jul 14 17:58:12 2009 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Tue Jul 14 17:58:12 2009 +0000
tree b1c6d94c75853c1af23b5ba5cde6e8fd1a51043e
parent 78c06bd9b7f7eb31562177b6580bd6a80fe9a3ae

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

Lib/unittest.py

diff --git a/Lib/unittest.py b/Lib/unittest.py
index bf7baa1..064429c 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -1643,8 +1643,6 @@
                  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 @@
         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)