summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/main.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-22 02:02:37 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-22 02:02:37 (GMT)
commitf8197c3489ff7a12259d9eac6d284514f113c0fe (patch)
tree8a9968f2cdce254bc717cb540b1dc0e375e31f03 /Lib/unittest/main.py
parente3a1f6d3b7850c1fdca803d9530ded2315297de3 (diff)
downloadcpython-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/main.py')
-rw-r--r--Lib/unittest/main.py2
1 files changed, 1 insertions, 1 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