[Python-checkins] r81055 - in python/trunk/Lib/unittest: __main__.py main.py
michael.foord
python-checkins at python.org
Mon May 10 22:21:17 CEST 2010
Author: michael.foord
Date: Mon May 10 22:21:16 2010
New Revision: 81055
Log:
Improving help message for python -m unittest. Issue 8303.
Modified:
python/trunk/Lib/unittest/__main__.py
python/trunk/Lib/unittest/main.py
Modified: python/trunk/Lib/unittest/__main__.py
==============================================================================
--- python/trunk/Lib/unittest/__main__.py (original)
+++ python/trunk/Lib/unittest/__main__.py Mon May 10 22:21:16 2010
@@ -2,7 +2,7 @@
import sys
if sys.argv[0].endswith("__main__.py"):
- sys.argv[0] = "unittest"
+ sys.argv[0] = "python -m unittest"
__unittest = True
Modified: python/trunk/Lib/unittest/main.py
==============================================================================
--- python/trunk/Lib/unittest/main.py (original)
+++ python/trunk/Lib/unittest/main.py Mon May 10 22:21:16 2010
@@ -22,10 +22,9 @@
-q, --quiet Minimal output
%(failfast)s%(catchbreak)s%(buffer)s
Examples:
- %(progName)s test_module - run tests from test_module
- %(progName)s test_module.TestClass - run tests from
- test_module.TestClass
- %(progName)s test_module.TestClass.test_method - run specified test method
+ %(progName)s test_module - run tests from test_module
+ %(progName)s module.TestClass - run tests from module.TestClass
+ %(progName)s module.Class.test_method - run specified test method
[tests] can be a list of any number of test modules, classes and test
methods.
@@ -68,7 +67,7 @@
USAGE = USAGE_FROM_MODULE
# defaults for testing
- failfast = catchbreak = buffer = None
+ failfast = catchbreak = buffer = progName = None
def __init__(self, module='__main__', defaultTest=None, argv=None,
testRunner=None, testLoader=loader.defaultTestLoader,
@@ -160,8 +159,10 @@
def _do_discovery(self, argv, Loader=loader.TestLoader):
# handle command line args for test discovery
+ self.progName = '%s discover' % self.progName
import optparse
parser = optparse.OptionParser()
+ parser.prog = self.progName
parser.add_option('-v', '--verbose', dest='verbose', default=False,
help='Verbose output', action='store_true')
if self.failfast != False:
More information about the Python-checkins
mailing list