From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 13 Sep 2017 00:43:44 +0000 (-0700)
Subject: [3.6] bpo-31249: Fix test_concurrent_futures dangling thread (GH-3521) (#3522)
X-Git-Tag: v3.6.3rc1~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94eb2d5b73d07bc447f1fe19923b4c3259734b9c;p=python

[3.6] bpo-31249: Fix test_concurrent_futures dangling thread (GH-3521) (#3522)

ProcessPoolShutdownTest.test_del_shutdown() now closes the call queue
and joins its thread, to prevent leaking a dangling thread.
(cherry picked from commit 3bcf157c115ba3e48bce62ac8cb13c703475a113)
---

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 03f8d1d711..e5d6b7e09b 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -226,11 +226,14 @@ class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, BaseTestCa
         list(executor.map(abs, range(-5, 5)))
         queue_management_thread = executor._queue_management_thread
         processes = executor._processes
+        call_queue = executor._call_queue
         del executor
 
         queue_management_thread.join()
         for p in processes.values():
             p.join()
+        call_queue.close()
+        call_queue.join_thread()
 
 
 class WaitTests: