From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 27 Jun 2018 16:45:01 +0000 (-0700) Subject: bpo-30356: Fix test_mymanager_context() of multiprocessing (GH-7968) X-Git-Tag: v3.6.7rc1~235 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a599323fc7661668a01e9fbb0d2369e62941bdf1;p=python bpo-30356: Fix test_mymanager_context() of multiprocessing (GH-7968) test_mymanager_context() now also accepts -SIGTERM as an expected exitcode for the manager process. The process is killed with SIGTERM if it takes longer than 1 second to stop. (cherry picked from commit fbd7172325e6ce55b6d5d3d7603e4c1c8a219cb8) Co-authored-by: Victor Stinner --- diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 3fa45b6787..e0edff4192 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -2400,7 +2400,9 @@ class _TestMyManager(BaseTestCase): def test_mymanager_context(self): with MyManager() as manager: self.common(manager) - self.assertEqual(manager._process.exitcode, 0) + # bpo-30356: BaseManager._finalize_manager() sends SIGTERM + # to the manager process if it takes longer than 1 second to stop. + self.assertIn(manager._process.exitcode, (0, -signal.SIGTERM)) def test_mymanager_context_prestarted(self): manager = MyManager()