Correct usage message displayed for python -m unittest -h

This commit is contained in:
Michael Foord 2010-03-22 02:49:08 +00:00
parent 0ce167277a
commit eef159bd17
3 changed files with 4 additions and 10 deletions

View File

@ -52,6 +52,7 @@ __all__ = ['TestResult', 'TestCase', 'TestSuite',
# Expose obsolete functions for backwards compatibility
__all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
__unittest = True
from .result import TestResult
from .case import (TestCase, FunctionTestCase, SkipTest, skip, skipIf,
@ -64,5 +65,3 @@ from .runner import TextTestRunner, TextTestResult
# deprecated
_TextTestResult = TextTestResult
__unittest = True

View File

@ -6,6 +6,7 @@ if sys.argv[0].endswith("__main__.py"):
__unittest = True
from .main import main, TestProgram, USAGE_AS_MAIN
TestProgram.USAGE = USAGE_AS_MAIN
from .main import main
main(module=None)

View File

@ -58,17 +58,11 @@ Examples:
in MyTestCase
"""
if __name__ == '__main__':
USAGE = USAGE_AS_MAIN
else:
USAGE = USAGE_FROM_MODULE
class TestProgram(object):
"""A command-line program that runs a set of tests; this is primarily
for making test modules conveniently executable.
"""
USAGE = USAGE
USAGE = USAGE_FROM_MODULE
def __init__(self, module='__main__', defaultTest=None,
argv=None, testRunner=None,
testLoader=loader.defaultTestLoader, exit=True,