https://github.com/python/cpython/commit/ed015d05f2820c16dde6e6f12d55acf05e3fd5ff
commit: ed015d05f2820c16dde6e6f12d55acf05e3fd5ff
branch: 3.12
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: vstinner <vstin...@python.org>
date: 2025-03-05T13:00:41+01:00
summary:
[3.12] gh-116742: Fix subprocess test_check_output_timeout() (GH-130836)
(#130874)
gh-116742: Fix subprocess test_check_output_timeout() (GH-130836)
Fix a race condition in test_check_output_timeout() of
test_subprocess. Don't write into stdout anymore, since there is no
reliable way to synchronize the parent and the child processes.
Change the timeout from 3 seconds to 0.1 seconds, and remove
@requires_resource('walltime') decorator.
(cherry picked from commit 67a942d4272145ccdbdf4ceff31318e176f71355)
Co-authored-by: Victor Stinner <vstin...@python.org>
files:
M Lib/test/test_subprocess.py
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 4e8e85a5902f30..d1d0fa7750b677 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -268,21 +268,13 @@ def test_check_output_stdin_with_input_arg(self):
self.assertIn('stdin', c.exception.args[0])
self.assertIn('input', c.exception.args[0])
- @support.requires_resource('walltime')
def test_check_output_timeout(self):
# check_output() function with timeout arg
with self.assertRaises(subprocess.TimeoutExpired) as c:
output = subprocess.check_output(
[sys.executable, "-c",
- "import sys, time\n"
- "sys.stdout.write('BDFL')\n"
- "sys.stdout.flush()\n"
- "time.sleep(3600)"],
- # Some heavily loaded buildbots (sparc Debian 3.x) require
- # this much time to start and print.
- timeout=3)
- self.fail("Expected TimeoutExpired.")
- self.assertEqual(c.exception.output, b'BDFL')
+ "import time; time.sleep(3600)"],
+ timeout=0.1)
def test_call_kwargs(self):
# call() function with keyword args
@@ -1708,20 +1700,11 @@ def test_check_output_stdin_with_input_arg(self):
self.assertIn('stdin', c.exception.args[0])
self.assertIn('input', c.exception.args[0])
- @support.requires_resource('walltime')
def test_check_output_timeout(self):
with self.assertRaises(subprocess.TimeoutExpired) as c:
- cp = self.run_python((
- "import sys, time\n"
- "sys.stdout.write('BDFL')\n"
- "sys.stdout.flush()\n"
- "time.sleep(3600)"),
- # Some heavily loaded buildbots (sparc Debian 3.x) require
- # this much time to start and print.
- timeout=3, stdout=subprocess.PIPE)
- self.assertEqual(c.exception.output, b'BDFL')
- # output is aliased to stdout
- self.assertEqual(c.exception.stdout, b'BDFL')
+ cp = self.run_python(
+ "import time; time.sleep(3600)",
+ timeout=0.1, stdout=subprocess.PIPE)
def test_run_kwargs(self):
newenv = os.environ.copy()
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
