From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Mon, 22 Mar 2010 01:56:54 +0000 (+0000)
Subject: expected failure should not trigger failfast behavior in unittest.
X-Git-Tag: v2.7b1~263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ce167277a1999ceab79c84a871ed069c97f4ca7;p=thirdparty%2FPython%2Fcpython.git

expected failure should not trigger failfast behavior in unittest.
---

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 05c0182bfaf8..5d51ffc547ce 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2113,12 +2113,6 @@ class Test_TestResult(TestCase):
         result.addUnexpectedSuccess(None)
         self.assertTrue(result.shouldStop)
 
-        result = unittest.TestResult()
-        result._exc_info_to_string = lambda *_: ''
-        result.failfast = True
-        result.addExpectedFailure(None, None)
-        self.assertTrue(result.shouldStop)
-
     def testFailFastSetByRunner(self):
         runner = unittest.TextTestRunner(stream=StringIO(), failfast=True)
         def test(result):
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 8fd23c0691e8..35466ccfabc2 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -178,7 +178,7 @@ class TestProgram(object):
                 testRunner = self.testRunner(verbosity=self.verbosity,
                                              failfast=self.failfast)
             except TypeError:
-                # didn't accept the verbosity or failfast argument
+                # didn't accept the verbosity or failfast arguments
                 testRunner = self.testRunner()
         else:
             # it is assumed to be a TestRunner instance
diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py
index 96d56a114e96..ec80e8eea587 100644
--- a/Lib/unittest/result.py
+++ b/Lib/unittest/result.py
@@ -81,7 +81,6 @@ class TestResult(object):
         """Called when a test is skipped."""
         self.skipped.append((test, reason))
 
-    @failfast
     def addExpectedFailure(self, test, err):
         """Called when an expected failure/error occured."""
         self.expectedFailures.append(