Move adding unittest test discovery command line options into their own method.

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index dc64575888bb8f7c9e3c328a0754857b3ff4fd66..a25a2f8e92f19024664afb17866c6c6a98358409 100644 (file)
--- 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()