From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 12 Jun 2024 19:58:29 +0000 (+0200)
Subject: [3.13] gh-118908: Protect the REPL subprocess with a timeout in tests (GH-120408... 
X-Git-Tag: v3.13.0b3~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff358616ddb5da18c79ceffabb55c3806a345383;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-118908: Protect the REPL subprocess with a timeout in tests (GH-120408) (#120430)

(cherry picked from commit 3453362183f083e37ea866a7ae1b34147ffaf81d)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
---

diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py
index 3167b8473bfe..41ba5959a1ec 100644
--- a/Lib/test/test_pyrepl/test_pyrepl.py
+++ b/Lib/test/test_pyrepl/test_pyrepl.py
@@ -8,6 +8,7 @@ import sys
 from unittest import TestCase, skipUnless
 from unittest.mock import patch
 from test.support import force_not_colorized
+from test.support import SHORT_TIMEOUT
 
 from .support import (
     FakeConsole,
@@ -885,5 +886,9 @@ class TestMain(TestCase):
 
         os.close(master_fd)
         os.close(slave_fd)
-        exit_code = process.wait()
+        try:
+            exit_code = process.wait(timeout=SHORT_TIMEOUT)
+        except subprocess.TimeoutExpired:
+            process.kill()
+            exit_code = process.returncode
         return "\n".join(output), exit_code