[Python-checkins] bpo-31249: test_concurrent_futures checks dangling threads (#3167)
Victor Stinner
webhook-mailer at python.org
Mon Aug 21 17:24:27 EDT 2017
https://github.com/python/cpython/commit/489d91c61d02f401551966f1558ee2dc87fc0ad9
commit: 489d91c61d02f401551966f1558ee2dc87fc0ad9
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-21T23:24:24+02:00
summary:
bpo-31249: test_concurrent_futures checks dangling threads (#3167)
Add a BaseTestCase class to test_concurrent_futures to check for
dangling threads and processes on all tests, not only tests using
ExecutorMixin.
files:
M Lib/test/test_concurrent_futures.py
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index c649555f39c..ebc30a49e5e 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -59,11 +59,20 @@ def my_method(self):
pass
+class BaseTestCase(unittest.TestCase):
+ def setUp(self):
+ self._thread_key = test.support.threading_setup()
+
+ def tearDown(self):
+ test.support.reap_children()
+ test.support.threading_cleanup(*self._thread_key)
+
+
class ExecutorMixin:
worker_count = 5
def setUp(self):
- self._thread_cleanup = test.support.threading_setup()
+ super().setUp()
self.t1 = time.time()
try:
@@ -81,8 +90,7 @@ def tearDown(self):
print("%.2fs" % dt, end=' ')
self.assertLess(dt, 60, "synchronization issue: test lasted too long")
- test.support.threading_cleanup(*self._thread_cleanup)
- test.support.reap_children()
+ super().tearDown()
def _prime_executor(self):
# Make sure that the executor is ready to do work before running the
@@ -130,7 +138,7 @@ def test_hang_issue12364(self):
f.result()
-class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, unittest.TestCase):
+class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase):
def _prime_executor(self):
pass
@@ -185,7 +193,7 @@ def test_thread_names_default(self):
t.join()
-class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, unittest.TestCase):
+class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, BaseTestCase):
def _prime_executor(self):
pass
@@ -322,7 +330,7 @@ def test_timeout(self):
self.assertEqual(set([future2]), pending)
-class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, unittest.TestCase):
+class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, BaseTestCase):
def test_pending_calls_race(self):
# Issue #14406: multi-threaded race condition when waiting on all
@@ -340,7 +348,7 @@ def future_func():
sys.setswitchinterval(oldswitchinterval)
-class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, unittest.TestCase):
+class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, BaseTestCase):
pass
@@ -389,11 +397,11 @@ def test_duplicate_futures(self):
self.assertEqual(len(completed), 1)
-class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, unittest.TestCase):
+class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, BaseTestCase):
pass
-class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, unittest.TestCase):
+class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, BaseTestCase):
pass
@@ -464,7 +472,7 @@ def test_max_workers_negative(self):
self.executor_type(max_workers=number)
-class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, unittest.TestCase):
+class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, BaseTestCase):
def test_map_submits_without_iteration(self):
"""Tests verifying issue 11777."""
finished = []
@@ -481,7 +489,7 @@ def test_default_workers(self):
(os.cpu_count() or 1) * 5)
-class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, unittest.TestCase):
+class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, BaseTestCase):
def test_killed_child(self):
# When a child process is abruptly terminated, the whole pool gets
# "broken".
@@ -537,7 +545,7 @@ def test_traceback(self):
f1.getvalue())
-class FutureTests(unittest.TestCase):
+class FutureTests(BaseTestCase):
def test_done_callback_with_result(self):
callback_result = None
def fn(callback_future):
More information about the Python-checkins
mailing list