]> granicus.if.org Git - python/commitdiff
Make sure to reap worker threads and processes at the end of test_concurrent_futures
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 15 Jul 2011 18:25:20 +0000 (20:25 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 15 Jul 2011 18:25:20 +0000 (20:25 +0200)
Lib/test/test_concurrent_futures.py

index 2662af76cff82d8ac48942d1a6bc008c4c9c33da..6cc57f85d0b7f46bc6d7ee408785fa0ac5169d1d 100644 (file)
@@ -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()