expected failure should not trigger failfast behavior in unittest.

This commit is contained in:
Michael Foord 2010-03-22 01:56:54 +00:00
parent 49899690a8
commit 0ce167277a
3 changed files with 1 additions and 8 deletions

View File

@ -2113,12 +2113,6 @@ class Test_TestResult(TestCase):
result.addUnexpectedSuccess(None) result.addUnexpectedSuccess(None)
self.assertTrue(result.shouldStop) 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): def testFailFastSetByRunner(self):
runner = unittest.TextTestRunner(stream=StringIO(), failfast=True) runner = unittest.TextTestRunner(stream=StringIO(), failfast=True)
def test(result): def test(result):

View File

@ -178,7 +178,7 @@ class TestProgram(object):
testRunner = self.testRunner(verbosity=self.verbosity, testRunner = self.testRunner(verbosity=self.verbosity,
failfast=self.failfast) failfast=self.failfast)
except TypeError: except TypeError:
# didn't accept the verbosity or failfast argument # didn't accept the verbosity or failfast arguments
testRunner = self.testRunner() testRunner = self.testRunner()
else: else:
# it is assumed to be a TestRunner instance # it is assumed to be a TestRunner instance

View File

@ -81,7 +81,6 @@ class TestResult(object):
"""Called when a test is skipped.""" """Called when a test is skipped."""
self.skipped.append((test, reason)) self.skipped.append((test, reason))
@failfast
def addExpectedFailure(self, test, err): def addExpectedFailure(self, test, err):
"""Called when an expected failure/error occured.""" """Called when an expected failure/error occured."""
self.expectedFailures.append( self.expectedFailures.append(