diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-03-22 01:46:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-03-22 01:46:47 (GMT) |
| commit | 434ae7703d08ab47dab0fcf9f382bbe7ae2996a1 (patch) | |
| tree | c5a5f1eb91b447a65ea9fe6b8c3d10ab06899ed3 /Lib/test/test_unittest.py | |
| parent | 8769fd8a17dad1b1861c04ea75ce46478d21a34d (diff) | |
| download | cpython-434ae7703d08ab47dab0fcf9f382bbe7ae2996a1.zip cpython-434ae7703d08ab47dab0fcf9f382bbe7ae2996a1.tar.gz cpython-434ae7703d08ab47dab0fcf9f382bbe7ae2996a1.tar.bz2 | |
Merged revisions 79268 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79268 | michael.foord | 2010-03-21 20:41:11 -0500 (Sun, 21 Mar 2010) | 1 line
Removing Python 2.3 compatibility code from unittest.
........
Diffstat (limited to 'Lib/test/test_unittest.py')
| -rw-r--r-- | Lib/test/test_unittest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index c8fc439..a88d75b 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -3991,13 +3991,15 @@ class TestDiscovery(TestCase): program._do_discovery(['-p', 'fish'], Loader=Loader) self.assertEqual(program.test, 'tests') self.assertEqual(Loader.args, [('.', 'fish', None)]) + self.assertFalse(program.failfast) Loader.args = [] program = object.__new__(TestProgram) - program._do_discovery(['-p', 'eggs', '-s', 'fish', '-v'], Loader=Loader) + program._do_discovery(['-p', 'eggs', '-s', 'fish', '-v', '-f'], Loader=Loader) self.assertEqual(program.test, 'tests') self.assertEqual(Loader.args, [('fish', 'eggs', None)]) self.assertEqual(program.verbosity, 2) + self.assertTrue(program.failfast) class TestSetups(unittest.TestCase): |