Merged revisions 79270 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79270 | michael.foord | 2010-03-21 20:56:54 -0500 (Sun, 21 Mar 2010) | 1 line

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

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index a88d75b6897e5593fbc977c1d17998e806a93a8d..d291d90e7366f472b026640945d75ec133db7f25 100644 (file)
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2125,12 +2125,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=io.StringIO(), failfast=True)
         def test(result):

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 1db7978db6355d93a4eb477bb8448c5747c5ef49..f2f10448afe7fd2760feffcc135cc68950621bd1 100644 (file)
--- 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 96d56a114e966c60890525f5921afefa4cbad5ae..ec80e8eea5871c4a6c9aa856f902ecfbba2a20db 100644 (file)
--- 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(