summaryrefslogtreecommitdiff
path: root/Lib/test/test_unittest.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-22 02:02:37 +0000
committerBenjamin Peterson <benjamin@python.org>2010-03-22 02:02:37 +0000
commit6d4dfeb70e060c2f8155e29aa1e93e734e1fbeb5 (patch)
tree68053ecc4d66cc65bacd332880f893979fa43da1 /Lib/test/test_unittest.py
parent55f700ae909cd1f653a79b6a58dd8035a6904c91 (diff)
downloadcpython-6d4dfeb70e060c2f8155e29aa1e93e734e1fbeb5.tar.gz
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/test/test_unittest.py')
-rw-r--r--Lib/test/test_unittest.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index a88d75b689..d291d90e73 100644
--- 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):