Author: michael.foord Date: Sat Mar 27 14:25:41 2010 New Revision: 79465 Log: 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 ........ Added: python/branches/py3k/Lib/unittest/signals.py - copied unchanged from r79437, /python/trunk/Lib/unittest/signals.py python/branches/py3k/Lib/unittest/test/test_break.py - copied, changed from r79437, /python/trunk/Lib/unittest/test/test_break.py Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/unittest/__init__.py python/branches/py3k/Lib/unittest/main.py python/branches/py3k/Lib/unittest/runner.py python/branches/py3k/Lib/unittest/test/test_discovery.py Modified: python/branches/py3k/Lib/unittest/__init__.py ============================================================================== --- python/branches/py3k/Lib/unittest/__init__.py (original) +++ python/branches/py3k/Lib/unittest/__init__.py Sat Mar 27 14:25:41 2010 @@ -47,7 +47,8 @@ __all__ = ['TestResult', 'TestCase', 'TestSuite', 'TextTestRunner', 'TestLoader', 'FunctionTestCase', 'main', 'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless', - 'expectedFailure', 'TextTestResult'] + 'expectedFailure', 'TextTestResult', 'installHandler', + 'registerResult', 'removeResult'] # Expose obsolete functions for backwards compatibility __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases']) @@ -62,6 +63,7 @@ findTestCases) from .main import TestProgram, main from .runner import TextTestRunner, TextTestResult +from .signals import installHandler, registerResult, removeResult # deprecated _TextTestResult = TextTestResult Modified: python/branches/py3k/Lib/unittest/main.py ============================================================================== --- python/branches/py3k/Lib/unittest/main.py (original) +++ python/branches/py3k/Lib/unittest/main.py Sat Mar 27 14:25:41 2010 @@ -5,10 +5,14 @@ import types from . import loader, runner +from .signals import installHandler __unittest = True +FAILFAST = " -f, --failfast Stop on first failure\n" +CATCHBREAK = " -c, --catch Catch control-C and display results\n" + USAGE_AS_MAIN = """\ Usage: %(progName)s [options] [tests] @@ -16,8 +20,7 @@ -h, --help Show this message -v, --verbose Verbose output -q, --quiet Minimal output - -f, --failfast Stop on first failure - +%(failfast)s%(catchbreak)s Examples: %(progName)s test_module - run tests from test_module %(progName)s test_module.TestClass - run tests from @@ -31,8 +34,7 @@ Options: -v, --verbose Verbose output - -f, --failfast Stop on first failure - -s directory Directory to start discovery ('.' default) +%(failfast)s%(catchbreak)s -s directory Directory to start discovery ('.' default) -p pattern Pattern to match test files ('test*.py' default) -t directory Top level directory of project (default to start directory) @@ -48,8 +50,7 @@ -h, --help Show this message -v, --verbose Verbose output -q, --quiet Minimal output - -f, --failfast Stop on first failure - +%(failfast)s%(catchbreak)s Examples: %(progName)s - run default set of tests %(progName)s MyTestSuite - run suite 'MyTestSuite' @@ -58,15 +59,21 @@ in MyTestCase """ + + class TestProgram(object): """A command-line program that runs a set of tests; this is primarily for making test modules conveniently executable. """ USAGE = USAGE_FROM_MODULE + + # defaults for testing + failfast = catchbreak = None + def __init__(self, module='__main__', defaultTest=None, argv=None, testRunner=None, testLoader=loader.defaultTestLoader, exit=True, - verbosity=1, failfast=False): + verbosity=1, failfast=None, catchbreak=None): if isinstance(module, str): self.module = __import__(module) for part in module.split('.')[1:]: @@ -78,6 +85,7 @@ self.exit = exit self.failfast = failfast + self.catchbreak = catchbreak self.verbosity = verbosity self.defaultTest = defaultTest self.testRunner = testRunner @@ -89,7 +97,12 @@ def usageExit(self, msg=None): if msg: print(msg) - print(self.USAGE % self.__dict__) + usage = {'progName': self.progName, 'catchbreak': '', 'failfast': ''} + if self.failfast != False: + usage['failfast'] = FAILFAST + if self.catchbreak != False: + usage['catchbreak'] = CATCHBREAK + print(self.USAGE % usage) sys.exit(2) def parseArgs(self, argv): @@ -98,9 +111,9 @@ return import getopt - long_opts = ['help', 'verbose', 'quiet', 'failfast'] + long_opts = ['help', 'verbose', 'quiet', 'failfast', 'catch'] try: - options, args = getopt.getopt(argv[1:], 'hHvqf', long_opts) + options, args = getopt.getopt(argv[1:], 'hHvqfc', long_opts) for opt, value in options: if opt in ('-h','-H','--help'): self.usageExit() @@ -109,7 +122,13 @@ if opt in ('-v','--verbose'): self.verbosity = 2 if opt in ('-f','--failfast'): - self.failfast = True + if self.failfast is None: + self.failfast = True + # Should this raise an exception if -f is not valid? + if opt in ('-c','--catch'): + if self.catchbreak is None: + self.catchbreak = True + # Should this raise an exception if -c is not valid? if len(args) == 0 and self.defaultTest is None: # createTests will load tests from self.module self.testNames = None @@ -137,8 +156,14 @@ parser = optparse.OptionParser() parser.add_option('-v', '--verbose', dest='verbose', default=False, help='Verbose output', action='store_true') - parser.add_option('-f', '--failfast', dest='failfast', default=False, - help='Stop on first fail or error', action='store_true') + if self.failfast != False: + parser.add_option('-f', '--failfast', dest='failfast', default=False, + help='Stop on first fail or error', + action='store_true') + if self.catchbreak != False: + parser.add_option('-c', '--catch', dest='catchbreak', default=False, + help='Catch ctrl-C and display results so far', + action='store_true') parser.add_option('-s', '--start-directory', dest='start', default='.', help="Directory to start discovery ('.' default)") parser.add_option('-p', '--pattern', dest='pattern', default='test*.py', @@ -153,7 +178,13 @@ for name, value in zip(('start', 'pattern', 'top'), args): setattr(options, name, value) - self.failfast = options.failfast + # only set options from the parsing here + # if they weren't set explicitly in the constructor + if self.failfast is None: + self.failfast = options.failfast + if self.catchbreak is None: + self.catchbreak = options.catchbreak + if options.verbose: self.verbosity = 2 @@ -165,6 +196,8 @@ self.test = loader.discover(start_dir, pattern, top_level_dir) def runTests(self): + if self.catchbreak: + installHandler() if self.testRunner is None: self.testRunner = runner.TextTestRunner if isinstance(self.testRunner, type): Modified: python/branches/py3k/Lib/unittest/runner.py ============================================================================== --- python/branches/py3k/Lib/unittest/runner.py (original) +++ python/branches/py3k/Lib/unittest/runner.py Sat Mar 27 14:25:41 2010 @@ -4,6 +4,7 @@ import time from . import result +from .signals import registerResult __unittest = True @@ -138,6 +139,7 @@ def run(self, test): "Run the given test case or test suite." result = self._makeResult() + registerResult(result) result.failfast = self.failfast startTime = time.time() startTestRun = getattr(result, 'startTestRun', None) Copied: python/branches/py3k/Lib/unittest/test/test_break.py (from r79437, /python/trunk/Lib/unittest/test/test_break.py) ============================================================================== --- /python/trunk/Lib/unittest/test/test_break.py (original) +++ python/branches/py3k/Lib/unittest/test/test_break.py Sat Mar 27 14:25:41 2010 @@ -1,11 +1,9 @@ import gc +import io import os import signal import weakref -from cStringIO import StringIO - - import unittest @@ -140,7 +138,7 @@ def testRunner(self): # Creating a TextTestRunner with the appropriate argument should # register the TextTestResult it creates - runner = unittest.TextTestRunner(stream=StringIO()) + runner = unittest.TextTestRunner(stream=io.StringIO()) result = runner.run(unittest.TestSuite()) self.assertIn(result, unittest.signals._results) Modified: python/branches/py3k/Lib/unittest/test/test_discovery.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_discovery.py (original) +++ python/branches/py3k/Lib/unittest/test/test_discovery.py Sat Mar 27 14:25:41 2010 @@ -275,11 +275,18 @@ 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()