diff options
| author | Michael Foord <michael@voidspace.org.uk> | 2013-02-11 12:53:21 +0000 |
|---|---|---|
| committer | Michael Foord <michael@voidspace.org.uk> | 2013-02-11 12:53:21 +0000 |
| commit | c36bf9918929ae37db1fea149ff9d9d408e62943 (patch) | |
| tree | 1aea468e9481425b43e03cf121071757d81cc863 | |
| parent | cb66ee7f56fe66d4b4cb7bc6abe6e1314e98b5c9 (diff) | |
| download | cpython-git-c36bf9918929ae37db1fea149ff9d9d408e62943.tar.gz | |
Correction to issue 17052 fix
| -rw-r--r-- | Lib/unittest/main.py | 2 | ||||
| -rw-r--r-- | Lib/unittest/test/test_discovery.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 1e001a6a26..b25367992d 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -159,7 +159,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 3dec2ee57e..8c031a0034 100644 --- a/Lib/unittest/test/test_discovery.py +++ b/Lib/unittest/test/test_discovery.py @@ -236,7 +236,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)]) @@ -202,7 +202,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. |