Merge

mfoord · mfoord · commit b71b8ec7b1d3 · 2013-02-11T13:29:58.000Z
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
@@ -222,7 +222,7 @@ def _addDiscoveryOptions(self, parser):
 
     def _do_discovery(self, argv, Loader=None):
         if Loader is None:
-            Loader = self.testLoader
+            Loader = lambda: self.testLoader
 
         # handle command line args for test discovery
         self.progName = '%s discover' % self.progName
diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
@@ -269,7 +269,7 @@ def discover(self, start_dir, pattern, top_level_dir):
                 self.args.append((start_dir, pattern, top_level_dir))
                 return 'tests'
 
-        program.testLoader = Loader
+        program.testLoader = Loader()
         program._do_discovery(['-v'])
         self.assertEqual(Loader.args, [('.', 'test*.py', None)])
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -175,7 +175,7 @@ Core and Builtins
 Library
 -------
 
-- Issue #17502: unittest discovery should use self.testLoader.
+- Issue #17052: unittest discovery should use self.testLoader.
 
 - Issue #4591: Uid and gid values larger than 2**31 are supported now.
 
