summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-07-08 09:51:49 (GMT)
committerVictor Stinner <vstinner@redhat.com>2019-07-08 09:51:49 (GMT)
commitcdada40b23b1f7f527797ba7cb14c25820b05981 (patch)
treed25fdc6475e44d1e825868b69290333cd54a524b
parent66905d14672517d50dc8ba516b9839f9ddbcc131 (diff)
downloadcpython-cdada40b23b1f7f527797ba7cb14c25820b05981.zip
cpython-cdada40b23b1f7f527797ba7cb14c25820b05981.tar.gz
cpython-cdada40b23b1f7f527797ba7cb14c25820b05981.tar.bz2
bpo-37421: test_concurrent_futures stops ForkServer (GH-14643) (GH-14645)
test_concurrent_futures now explicitly stops the ForkServer instance if it's running. (cherry picked from commit e676244235895aeb6ec3b81ca3ccf4a70e487919) Co-authored-by: Victor Stinner <vstinner@redhat.com>
-rw-r--r--Lib/test/test_concurrent_futures.py3
-rw-r--r--Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst2
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index fa29820..98c9bc9 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -1310,6 +1310,9 @@ def tearDownModule():
# cleanup multiprocessing
multiprocessing.process._cleanup()
+ # Stop the ForkServer process if it's running
+ from multiprocessing import forkserver
+ forkserver._forkserver._stop()
# bpo-37421: Explicitly call _run_finalizers() to remove immediately
# temporary directories created by multiprocessing.util.get_temp_dir().
multiprocessing.util._run_finalizers()
diff --git a/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
new file mode 100644
index 0000000..0766d70
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-07-08-10-11-36.bpo-37421.OY77go.rst
@@ -0,0 +1,2 @@
+test_concurrent_futures now explicitly stops the ForkServer instance if it's
+running.