Merged revisions 78010 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78010 | michael.foord | 2010-02-06 00:22:26 +0000 (Sat, 06 Feb 2010) | 1 line
unittest.TestLoader creates a TestSuite before calling load_tests. Issue 7799.
........
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 73b3275..e58c6b7 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -272,12 +272,14 @@
load_tests_args = []
def load_tests(loader, tests, pattern):
+ self.assertIsInstance(tests, unittest.TestSuite)
load_tests_args.extend((loader, tests, pattern))
return tests
m.load_tests = load_tests
loader = unittest.TestLoader()
suite = loader.loadTestsFromModule(m)
+ self.assertIsInstance(suite, unittest.TestSuite)
self.assertEquals(load_tests_args, [loader, suite, None])
load_tests_args = []
diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index 68f954c..bfee3dc 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -61,9 +61,10 @@
tests.append(self.loadTestsFromTestCase(obj))
load_tests = getattr(module, 'load_tests', None)
+ tests = self.suiteClass(tests)
if use_load_tests and load_tests is not None:
return load_tests(self, tests, None)
- return self.suiteClass(tests)
+ return tests
def loadTestsFromName(self, name, module=None):
"""Return a suite of all tests cases given a string specifier.