From b36c70c9ff3c39441c8ab2ac264d039d98a47f67 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Mon, 12 Mar 2012 15:24:46 -0700 Subject: Move adding unittest test discovery command line options into their own method. --- Lib/unittest/main.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index dc64575..a25a2f8 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -211,11 +211,7 @@ class TestProgram(object): 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 @@ 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): + # 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() -- cgit v0.12