From: Michael Foord <michael@voidspace.org.uk>
Date: Fri, 28 Sep 2012 13:14:03 +0000 (+0100)
Subject: Closes issue #12376 : Pass on parameters in unittest.TextTestResult.__init__ super... 
X-Git-Tag: v3.2.4rc1~489
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a1901f86129dc15dc9004da02907eb1c90f32fa;p=thirdparty%2FPython%2Fcpython.git

Closes issue #12376 : Pass on parameters in unittest.TextTestResult.__init__ super call
---

diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
index 10c477843409..28b8865978a5 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 8e95410e9ee6..aed1e76940a0 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 26d0134e4da4..cb1df24f5a5a 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.