diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-07-15 19:11:23 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-07-15 19:11:23 (GMT) |
| commit | 58059197cc2a8c6f1fd3fb0e95614def14d0aaff (patch) | |
| tree | d3e06fcd53f64d03c9593a1ba494c14b77b65c17 /Lib | |
| parent | 5afa03a72ee6d27e742dc0ebc06a0630e1b37fe9 (diff) | |
| parent | 8391cf4e1d73683795e51ac5ce8ee9e61eea389d (diff) | |
| download | cpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.zip cpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.tar.gz cpython-58059197cc2a8c6f1fd3fb0e95614def14d0aaff.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 2662af7..6cc57f8 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -598,16 +598,20 @@ class FutureTests(unittest.TestCase): self.assertTrue(isinstance(f1.exception(timeout=5), IOError)) +@test.support.reap_threads def test_main(): - test.support.run_unittest(ProcessPoolExecutorTest, - ThreadPoolExecutorTest, - ProcessPoolWaitTests, - ThreadPoolWaitTests, - ProcessPoolAsCompletedTests, - ThreadPoolAsCompletedTests, - FutureTests, - ProcessPoolShutdownTest, - ThreadPoolShutdownTest) + try: + test.support.run_unittest(ProcessPoolExecutorTest, + ThreadPoolExecutorTest, + ProcessPoolWaitTests, + ThreadPoolWaitTests, + ProcessPoolAsCompletedTests, + ThreadPoolAsCompletedTests, + FutureTests, + ProcessPoolShutdownTest, + ThreadPoolShutdownTest) + finally: + test.support.reap_children() if __name__ == "__main__": test_main() |