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/__init__.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/__init__.py')
| -rw-r--r-- | Lib/unittest/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/unittest/__init__.py b/Lib/unittest/__init__.py index 7153802..e84299e 100644 --- a/Lib/unittest/__init__.py +++ b/Lib/unittest/__init__.py @@ -47,7 +47,8 @@ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. __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 @@ from .loader import (TestLoader, defaultTestLoader, makeSuite, getTestCaseNames, findTestCases) from .main import TestProgram, main from .runner import TextTestRunner, TextTestResult +from .signals import installHandler, registerResult, removeResult # deprecated _TextTestResult = TextTestResult |