From 8fd396bd227ba35e0da477e5eef70e85700f186c Mon Sep 17 00:00:00 2001
From: Michael Foord <michael@voidspace.org.uk>
Date: Mon, 11 Feb 2013 00:04:24 +0000
Subject: Issue 17502: unittest discovery should use self.testLoader

---
 Lib/unittest/main.py                |  5 ++++-
 Lib/unittest/test/test_discovery.py | 14 ++++++++++++++
 Misc/NEWS                           |  2 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 55d4e4b..d09bccd 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -197,7 +197,10 @@ class TestProgram(object):
             self.test = self.testLoader.loadTestsFromNames(self.testNames,
                                                            self.module)
 
-    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
         import optparse
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index e688f8e..eba269f 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -253,12 +253,26 @@ class TestDiscovery(unittest.TestCase):
 
         program = TestableTestProgram()
         program.usageExit = usageExit
+        program.testLoader = None
 
         with self.assertRaises(Stop):
             # too many args
             program._do_discovery(['one', 'two', 'three', 'four'])
 
 
+    def test_command_line_handling_do_discovery_uses_default_loader(self):
+        program = object.__new__(unittest.TestProgram)
+
+        class Loader(object):
+            args = []
+            def discover(self, start_dir, pattern, top_level_dir):
+                self.args.append((start_dir, pattern, top_level_dir))
+                return 'tests'
+
+        program.testLoader = Loader
+        program._do_discovery(['-v'])
+        self.assertEqual(Loader.args, [('.', 'test*.py', None)])
+
     def test_command_line_handling_do_discovery_calls_loader(self):
         program = TestableTestProgram()
 
diff --git a/Misc/NEWS b/Misc/NEWS
index eff2176..d6ac0e7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -221,6 +221,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #17502: unittest discovery should use self.testLoader.
+
 - Issue #17141: random.vonmisesvariate() no more hangs for large kappas.
 
 - Issue #17149: Fix random.vonmisesvariate to always return results in
-- 
cgit v0.12