mirror of https://github.com/python/cpython
Merge
This commit is contained in:
commit
8ef1fcecc5
|
@ -35,7 +35,7 @@ class TextTestResult(result.TestResult):
|
|||
separator2 = '-' * 70
|
||||
|
||||
def __init__(self, stream, descriptions, verbosity):
|
||||
super(TextTestResult, self).__init__()
|
||||
super(TextTestResult, self).__init__(stream, descriptions, verbosity)
|
||||
self.stream = stream
|
||||
self.showAll = verbosity > 1
|
||||
self.dots = verbosity == 1
|
||||
|
|
|
@ -149,6 +149,19 @@ class Test_TextTestRunner(unittest.TestCase):
|
|||
self.assertEqual(runner.resultclass, unittest.TextTestResult)
|
||||
|
||||
|
||||
def test_multiple_inheritance(self):
|
||||
class AResult(unittest.TestResult):
|
||||
def __init__(self, stream, descriptions, verbosity):
|
||||
super(AResult, self).__init__(stream, descriptions, verbosity)
|
||||
|
||||
class ATextResult(unittest.TextTestResult, AResult):
|
||||
pass
|
||||
|
||||
# This used to raise an exception due to TextTestResult not passing
|
||||
# on arguments in its __init__ super call
|
||||
ATextResult(None, None, 1)
|
||||
|
||||
|
||||
def testBufferAndFailfast(self):
|
||||
class Test(unittest.TestCase):
|
||||
def testFoo(self):
|
||||
|
|
|
@ -38,6 +38,8 @@ Library
|
|||
|
||||
- Issue #16064: unittest -m claims executable is "python", not "python3"
|
||||
|
||||
- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
|
||||
|
||||
- Issue #15222: Insert blank line after each message in mbox mailboxes
|
||||
|
||||
- Issue #16013: Fix CSV Reader parsing issue with ending quote characters.
|
||||
|
|
Loading…
Reference in New Issue