[Python-checkins] cpython (merge 3.2 -> 3.3): Merge
michael.foord
python-checkins at python.org
Mon Feb 11 14:40:02 CET 2013
http://hg.python.org/cpython/rev/c148804c2f5e
changeset: 82156:c148804c2f5e
branch: 3.3
parent: 82151:b8d7e385553d
parent: 82155:867763eb6985
user: Michael Foord <michael at voidspace.org.uk>
date: Mon Feb 11 13:29:58 2013 +0000
summary:
Merge
files:
Lib/unittest/main.py | 2 +-
Lib/unittest/test/test_discovery.py | 2 +-
Misc/NEWS | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -222,7 +222,7 @@
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
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -269,7 +269,7 @@
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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -175,7 +175,7 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list