[Python-checkins] r79270 - in python/trunk/Lib: test/test_unittest.py unittest/main.py unittest/result.py

[michael.foord]

Author: michael.foord
Date: Mon Mar 22 02:56:54 2010
New Revision: 79270

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

Modified:
   python/trunk/Lib/test/test_unittest.py
   python/trunk/Lib/unittest/main.py
   python/trunk/Lib/unittest/result.py

Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================
--- python/trunk/Lib/test/test_unittest.py	(original)
+++ python/trunk/Lib/test/test_unittest.py	Mon Mar 22 02:56:54 2010
@@ -2113,12 +2113,6 @@
         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):

Modified: python/trunk/Lib/unittest/main.py
==============================================================================
--- python/trunk/Lib/unittest/main.py	(original)
+++ python/trunk/Lib/unittest/main.py	Mon Mar 22 02:56:54 2010
@@ -178,7 +178,7 @@
                 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

Modified: python/trunk/Lib/unittest/result.py
==============================================================================
--- python/trunk/Lib/unittest/result.py	(original)
+++ python/trunk/Lib/unittest/result.py	Mon Mar 22 02:56:54 2010
@@ -81,7 +81,6 @@
         """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(