summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/unittest/main.py2
-rw-r--r--Lib/unittest/test/test_discovery.py2
-rw-r--r--Misc/NEWS2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index d09bccdf2c..63c8139000 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -199,7 +199,7 @@ class TestProgram(object):
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
index eba269fc7a..1fdf9913c9 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -269,7 +269,7 @@ class TestDiscovery(unittest.TestCase):
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
index d6ac0e7d61..1f772b7241 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -221,7 +221,7 @@ Core and Builtins
Library
-------
-- Issue #17502: unittest discovery should use self.testLoader.
+- Issue #17052: unittest discovery should use self.testLoader.
- Issue #17141: random.vonmisesvariate() no more hangs for large kappas.