diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-22 02:02:37 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-22 02:02:37 (GMT) |
| commit | f8197c3489ff7a12259d9eac6d284514f113c0fe (patch) | |
| tree | 8a9968f2cdce254bc717cb540b1dc0e375e31f03 /Lib/unittest | |
| parent | e3a1f6d3b7850c1fdca803d9530ded2315297de3 (diff) | |
| download | cpython-f8197c3489ff7a12259d9eac6d284514f113c0fe.zip cpython-f8197c3489ff7a12259d9eac6d284514f113c0fe.tar.gz cpython-f8197c3489ff7a12259d9eac6d284514f113c0fe.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/unittest')
| -rw-r--r-- | Lib/unittest/main.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/result.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 1db7978..f2f1044 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 96d56a1..ec80e8e 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( |