mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-08 03:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge

Browse source
This commit is contained in:
Michael Foord 2013-02-11 00:18:07 +00:00
commit a23a39c07d
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/unittest/main.py
View file

@ -175,6 +175,7 @@ class TestProgram(object):
self.module)
def _getOptParser(self):
import optparse
parser = optparse.OptionParser()
parser.prog = self.progName
parser.add_option('-v', '--verbose', dest='verbose', default=False,
@ -219,7 +220,10 @@ class TestProgram(object):
parser.add_option('-t', '--top-level-directory', dest='top', default=None,
help='Top level directory of project (defaults to start directory)')
def _do_discovery(self, argv, Loader=loader.TestLoader):
def _do_discovery(self, argv, Loader=None):
if Loader is None:
Loader = self.testLoader
# handle command line args for test discovery
self.progName = '%s discover' % self.progName
parser = self._getOptParser()