From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 11 Feb 2013 00:18:07 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.3.1rc1~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a23a39c07d3027e5139cc6127783cab23ca1a511;p=python

Merge
---

a23a39c07d3027e5139cc6127783cab23ca1a511
diff --cc Lib/unittest/main.py
index a25a2f8e92,d09bccdf2c..061916c052
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@@ -174,7 -197,13 +174,8 @@@ class TestProgram(object)
              self.test = self.testLoader.loadTestsFromNames(self.testNames,
                                                             self.module)
  
 -    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
 +    def _getOptParser(self):
+         import optparse
          parser = optparse.OptionParser()
          parser.prog = self.progName
          parser.add_option('-v', '--verbose', dest='verbose', default=False,
@@@ -219,12 -227,6 +220,15 @@@
          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()
 +        self._addDiscoveryOptions(parser)
 +
          options, args = parser.parse_args(argv)
          if len(args) > 3:
              self.usageExit()
diff --cc Misc/NEWS
index a56a1b3c53,d6ac0e7d61..0534ef1b07
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -175,8 -221,8 +175,10 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #17502: unittest discovery should use self.testLoader.
+ 
 +- Issue #4591: Uid and gid values larger than 2**31 are supported now.
 +
  - Issue #17141: random.vonmisesvariate() no more hangs for large kappas.
  
  - Issue #17149: Fix random.vonmisesvariate to always return results in