diff options
| author | Michael Foord <michael@voidspace.org.uk> | 2013-02-11 13:33:00 (GMT) |
|---|---|---|
| committer | Michael Foord <michael@voidspace.org.uk> | 2013-02-11 13:33:00 (GMT) |
| commit | 890d72d3c9896812a4bb07e785b273d1e6b001b0 (patch) | |
| tree | 4cad6b7bb54be19e838596b88bb34b696341c606 | |
| parent | 3420057adbb1076875e448c52f03d9e3b2a40956 (diff) | |
| parent | b71b8ec7b1d3ae8eb4f446387f766aea7d7d831b (diff) | |
| download | cpython-890d72d3c9896812a4bb07e785b273d1e6b001b0.zip cpython-890d72d3c9896812a4bb07e785b273d1e6b001b0.tar.gz cpython-890d72d3c9896812a4bb07e785b273d1e6b001b0.tar.bz2 | |
Merge. Closes issue 17052.
| -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 061916c..ead6493 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@ -222,7 +222,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 eba269f..1fdf991 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)]) @@ -250,7 +250,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. |