summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Foord <michael@voidspace.org.uk>2012-09-28 13:14:03 (GMT)
committerMichael Foord <michael@voidspace.org.uk>2012-09-28 13:14:03 (GMT)
commit7a1901f86129dc15dc9004da02907eb1c90f32fa (patch)
tree12939625eaef91a32648cd94b051f5c62b80ceea
parent57491e0703ab46f6f4f43e534750611d96be1aa2 (diff)
downloadcpython-7a1901f86129dc15dc9004da02907eb1c90f32fa.zip
cpython-7a1901f86129dc15dc9004da02907eb1c90f32fa.tar.gz
cpython-7a1901f86129dc15dc9004da02907eb1c90f32fa.tar.bz2
Closes issue #12376 : Pass on parameters in unittest.TextTestResult.__init__ super call
-rw-r--r--Lib/unittest/runner.py2
-rw-r--r--Lib/unittest/test/test_runner.py13
-rw-r--r--Misc/NEWS2
3 files changed, 16 insertions, 1 deletions
diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
index 10c4778..28b8865 100644
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -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
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
index 8e95410..aed1e76 100644
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -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):
diff --git a/Misc/NEWS b/Misc/NEWS
index 26d0134..cb1df24 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@ Core and Builtins
Library
-------
+- 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.