diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-27 13:25:41 (GMT) |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-03-27 13:25:41 (GMT) |
| commit | 65b69a1093921c61cca263c07027794e5ee7e667 (patch) | |
| tree | a98451f4668729530a7695485b030d713d705915 /Lib/unittest/test/test_discovery.py | |
| parent | 8777f01d71d1718dd4150490c0847cfce20f51a5 (diff) | |
| download | cpython-65b69a1093921c61cca263c07027794e5ee7e667.zip cpython-65b69a1093921c61cca263c07027794e5ee7e667.tar.gz cpython-65b69a1093921c61cca263c07027794e5ee7e667.tar.bz2 | |
Merged revisions 79437 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79437 | michael.foord | 2010-03-26 03:18:31 +0000 (Fri, 26 Mar 2010) | 1 line
Addition of -c command line option to unittest, to handle ctrl-c during a test run more elegantly
........
Diffstat (limited to 'Lib/unittest/test/test_discovery.py')
| -rw-r--r-- | Lib/unittest/test/test_discovery.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py index 512ef1f..5986271 100644 --- a/Lib/unittest/test/test_discovery.py +++ b/Lib/unittest/test/test_discovery.py @@ -275,11 +275,18 @@ class TestDiscovery(unittest.TestCase): self.assertEqual(program.test, 'tests') self.assertEqual(Loader.args, [('.', 'fish', None)]) self.assertFalse(program.failfast) + self.assertFalse(program.catchbreak) Loader.args = [] program = object.__new__(unittest.TestProgram) - program._do_discovery(['-p', 'eggs', '-s', 'fish', '-v', '-f'], Loader=Loader) + program._do_discovery(['-p', 'eggs', '-s', 'fish', '-v', '-f', '-c'], + Loader=Loader) self.assertEqual(program.test, 'tests') self.assertEqual(Loader.args, [('fish', 'eggs', None)]) self.assertEqual(program.verbosity, 2) self.assertTrue(program.failfast) + self.assertTrue(program.catchbreak) + + +if __name__ == '__main__': + unittest.main() |