diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-10-02 15:44:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 15:44:26 (GMT) |
| commit | a2074911baaa75216a6a3bc78487ee2254f031d5 (patch) | |
| tree | fedd170935aeca6031b6b8945b2e2f36bc2e780d /Lib/test/_test_multiprocessing.py | |
| parent | aaa8bf18c6e569abb178896a68786ad3857663e9 (diff) | |
| download | cpython-a2074911baaa75216a6a3bc78487ee2254f031d5.zip cpython-a2074911baaa75216a6a3bc78487ee2254f031d5.tar.gz cpython-a2074911baaa75216a6a3bc78487ee2254f031d5.tar.bz2 | |
[3.12] gh-110036: multiprocessing Popen.terminate() catches PermissionError (GH-110037) (#110064)
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 ca8fcab..34027b0 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -557,13 +557,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: |