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.
........
This commit is contained in:
Benjamin Peterson 2010-03-22 02:02:37 +00:00
parent e3a1f6d3b7
commit f8197c3489
3 changed files with 1 additions and 8 deletions

View file

@ -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