From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 4 Jul 2018 10:15:13 +0000 (-0700)
Subject: bpo-34040, multiprocessing: Fix test_forkserver_sigkill() (GH-8081)
X-Git-Tag: v3.6.7rc1~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae23d8de8d7d810a8dbe1b09ea37590aff3e1aa0;p=python

bpo-34040, multiprocessing: Fix test_forkserver_sigkill() (GH-8081)


Fix test_forkserver_sigkill() of test_multiprocessing_forkserver:
give more time to the first child process to complete, double the
sleep in the parent process.

Reduce also the child process sleep from 1000 ms to 500 ms, to not change
the total duration of the test.
(cherry picked from commit 07888e1cce89e9bb7dc501e287b4cb126e01c378)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
---

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index cbac335087..c0030ee2f4 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -494,13 +494,17 @@ class _TestProcess(BaseTestCase):
         from multiprocessing.forkserver import _forkserver
         _forkserver.ensure_running()
 
+        # First process sleeps 500 ms
+        delay = 0.5
+
         evt = self.Event()
-        proc = self.Process(target=self._sleep_and_set_event, args=(evt, 1.0))
+        proc = self.Process(target=self._sleep_and_set_event, args=(evt, delay))
         proc.start()
 
         pid = _forkserver._forkserver_pid
         os.kill(pid, signum)
-        time.sleep(1.0)  # give it time to die
+        # give time to the fork server to die and time to proc to complete
+        time.sleep(delay * 2.0)
 
         evt2 = self.Event()
         proc2 = self.Process(target=self._sleep_and_set_event, args=(evt2,))