diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-10 20:23:58 +0000 |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-10 20:23:58 +0000 |
| commit | f707aa7f8b8540439b2444edd1028665317a0466 (patch) | |
| tree | 5676c36a275bda43068d45cbbc33d512c1e38ffd | |
| parent | 85eacea31e508666db1ce29827308e98fba1bc21 (diff) | |
| download | cpython-git-f707aa7f8b8540439b2444edd1028665317a0466.tar.gz | |
Merged revisions 81055 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81055 | michael.foord | 2010-05-10 21:21:16 +0100 (Mon, 10 May 2010) | 1 line
Improving help message for python -m unittest. Issue 8303.
........
| -rw-r--r-- | Lib/unittest/__main__.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/main.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Lib/unittest/__main__.py b/Lib/unittest/__main__.py index 58e646d785..7320050ae9 100644 --- a/Lib/unittest/__main__.py +++ b/Lib/unittest/__main__.py @@ -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 diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 45af699223..6acff8fdbe 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -22,10 +22,9 @@ Options: -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 @@ class TestProgram(object): 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 @@ class TestProgram(object): 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: |