summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_unittest.py6
-rw-r--r--Lib/unittest/main.py2
-rw-r--r--Lib/unittest/result.py1
3 files changed, 1 insertions, 8 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index a88d75b..d291d90 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):
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(