[Python-checkins] r81879 - in python/branches/py3k: Lib/unittest/suite.py Lib/unittest/test/test_setups.py

[michael.foord]

Author: michael.foord
Date: Thu Jun 10 22:41:54 2010
New Revision: 81879

Log:
Merged revisions 81878 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81878 | michael.foord | 2010-06-10 21:40:21 +0100 (Thu, 10 Jun 2010) | 2 lines
  
  Fix issue with nested test suites debug method and module setups. (unittest)
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/suite.py
   python/branches/py3k/Lib/unittest/test/test_setups.py

Modified: python/branches/py3k/Lib/unittest/suite.py
==============================================================================
--- python/branches/py3k/Lib/unittest/suite.py	(original)
+++ python/branches/py3k/Lib/unittest/suite.py	Thu Jun 10 22:41:54 2010
@@ -109,7 +109,7 @@
                     continue
 
             if hasattr(test, '_wrapped_run'):
-                test._wrapped_run(result)
+                test._wrapped_run(result, debug)
             elif not debug:
                 test(result)
             else:

Modified: python/branches/py3k/Lib/unittest/test/test_setups.py
==============================================================================
--- python/branches/py3k/Lib/unittest/test/test_setups.py	(original)
+++ python/branches/py3k/Lib/unittest/test/test_setups.py	Thu Jun 10 22:41:54 2010
@@ -494,7 +494,9 @@
         Test.__module__ = 'Module'
         sys.modules['Module'] = Module
 
-        suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
+        _suite = unittest.defaultTestLoader.loadTestsFromTestCase(Test)
+        suite = unittest.TestSuite()
+        suite.addTest(_suite)
 
         messages = ('setUpModule', 'tearDownModule', 'setUpClass', 'tearDownClass', 'test_something')
         for phase, msg in enumerate(messages):