Commit dad7b7b1 authored by Michael Foord's avatar Michael Foord

Restore default testRunner argument in unittest.main to None. Issue 6177

parent abb4ec6d
......@@ -3325,6 +3325,14 @@ class Test_TestProgram(TestCase):
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
......
......@@ -1640,9 +1640,11 @@ class TestProgram(object):
"""
USAGE = USAGE
def __init__(self, module='__main__', defaultTest=None,
argv=None, testRunner=TextTestRunner,
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:]:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment