diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-09-29 01:04:58 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-29 01:04:58 (GMT) |
commit | efe83ad2762e3ea8b396b44947033445c9b31d04 (patch) | |
tree | 2afbd62f9879f13257ad97e035728cd161c3fd47 /Lib/test/_test_multiprocessing.py | |
parent | a99729599a70d73e8796f6c9d5cdf6807bda0cd5 (diff) | |
download | cpython-efe83ad2762e3ea8b396b44947033445c9b31d04.zip cpython-efe83ad2762e3ea8b396b44947033445c9b31d04.tar.gz cpython-efe83ad2762e3ea8b396b44947033445c9b31d04.tar.bz2 |
[3.11] gh-110036: multiprocessing Popen.terminate() catches PermissionError (GH-110037) (#110065)
gh-110036: multiprocessing Popen.terminate() catches PermissionError (GH-110037)
On Windows, multiprocessing Popen.terminate() now catchs
PermissionError and get the process exit code. If the process is
still running, raise again the PermissionError. Otherwise, the
process terminated as expected: store its exit code.
(cherry picked from commit bd4518c60c9df356cf5e05b81305e3644ebb5e70)
Co-authored-by: Victor Stinner <vstinner@python.org>
Diffstat (limited to 'Lib/test/_test_multiprocessing.py')
-rw-r--r-- | Lib/test/_test_multiprocessing.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index c3ba1f6..6249062 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -556,13 +556,14 @@ class _TestProcess(BaseTestCase): def test_terminate(self): exitcode = self._kill_process(multiprocessing.Process.terminate) - if os.name != 'nt': - self.assertEqual(exitcode, -signal.SIGTERM) + self.assertEqual(exitcode, -signal.SIGTERM) def test_kill(self): exitcode = self._kill_process(multiprocessing.Process.kill) if os.name != 'nt': self.assertEqual(exitcode, -signal.SIGKILL) + else: + self.assertEqual(exitcode, -signal.SIGTERM) def test_cpu_count(self): try: |