[Python-checkins] cpython: Move adding unittest test discovery command line options into their own method.

Mon Mar 12 23:25:21 CET 2012

http://hg.python.org/cpython/rev/8c5506468ecb
changeset: 75556:8c5506468ecb
parent: 75551:b154ab2cdb1e
user: Michael Foord <michael at voidspace.org.uk>
date: Mon Mar 12 15:24:46 2012 -0700
summary:
 Move adding unittest test discovery command line options into their own method.
files:
 Lib/unittest/main.py | 12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -211,11 +211,7 @@
 elif options.quiet:
 self.verbosity = 0
 
-
- def _do_discovery(self, argv, Loader=loader.TestLoader):
- # handle command line args for test discovery
- self.progName = '%s discover' % self.progName
- parser = self._getOptParser()
+ def _addDiscoveryOptions(self, parser):
 parser.add_option('-s', '--start-directory', dest='start', default='.',
 help="Directory to start discovery ('.' default)")
 parser.add_option('-p', '--pattern', dest='pattern', default='test*.py',
@@ -223,6 +219,12 @@
 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):
+ # handle command line args for test discovery
+ self.progName = '%s discover' % self.progName
+ parser = self._getOptParser()
+ self._addDiscoveryOptions(parser)
+
 options, args = parser.parse_args(argv)
 if len(args) > 3:
 self.usageExit()
-- 
Repository URL: http://hg.python.org/cpython
