From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 19 Jun 2024 13:38:37 +0000 (+0200)
Subject: [3.13] gh-120635: Avoid leaking processes in test_pyrepl (GH-120676) (#120741)
X-Git-Tag: v3.13.0b3~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb5d19440b8056bd2b272239a2c0b1c2063b3af6;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-120635: Avoid leaking processes in test_pyrepl (GH-120676) (#120741)

gh-120635: Avoid leaking processes in test_pyrepl (GH-120676)

If the child process takes longer than SHORT_TIMEOUT seconds to
complete, kill the process but then wait until it completes with no
timeout to not leak child processes.
(cherry picked from commit 0f3e36454d754026d6c510053ff1e4b22ae80cd9)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py
index 41ba5959a1ec..adc55f28f08a 100644
--- a/Lib/test/test_pyrepl/test_pyrepl.py
+++ b/Lib/test/test_pyrepl/test_pyrepl.py
@@ -890,5 +890,5 @@ class TestMain(TestCase):
             exit_code = process.wait(timeout=SHORT_TIMEOUT)
         except subprocess.TimeoutExpired:
             process.kill()
-            exit_code = process.returncode
+            exit_code = process.wait()
         return "\n".join(output), exit_code