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.
........
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 @@
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):