summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/unittest/suite.py2
-rw-r--r--Lib/unittest/test/test_setups.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 04d35b8..8602107 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -112,7 +112,7 @@ class TestSuite(BaseTestSuite):
continue
if hasattr(test, '_wrapped_run'):
- test._wrapped_run(result)
+ test._wrapped_run(result, debug)
elif not debug:
test(result)
else:
diff --git a/Lib/unittest/test/test_setups.py b/Lib/unittest/test/test_setups.py
index a9e1ae9..9456819 100644
--- a/Lib/unittest/test/test_setups.py
+++ b/Lib/unittest/test/test_setups.py
@@ -495,7 +495,9 @@ class TestSetups(unittest.TestCase):
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):