commit 41647d6dad0bcee398cdacb2901b0dd96f2ad08e
author Michael Foord <fuzzyman@voidspace.org.uk> Sat Feb 06 00:26:13 2010 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Sat Feb 06 00:26:13 2010 +0000
tree 1017de2284bc65c78cc3ed218b0ec9bb2d8f39eb
parent b112a41aa305ca16159ab60d916f0fb958db9d51

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.
........

Lib/test/test_unittest.py

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 = []