https://github.com/python/cpython/commit/c7b01e3c3268e86d689d273778488d9384559f10
commit: c7b01e3c3268e86d689d273778488d9384559f10
branch: 3.11
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-03-19T14:21:42Z
summary:
[3.11] gh-90872: Fix subprocess.Popen.wait() for negative timeout (#116989)
(#117003)
gh-90872: Fix subprocess.Popen.wait() for negative timeout (#116989)
On Windows, subprocess.Popen.wait() no longer calls
WaitForSingleObject() with a negative timeout: pass 0 ms if the
timeout is negative.
(cherry picked from commit 27cf3ed00cfe942f4277c273a3dda8ee2ba61fc8)
files:
A Misc/NEWS.d/next/Library/2024-03-19-11-08-26.gh-issue-90872.ghys95.rst
M Lib/subprocess.py
M Lib/test/test_subprocess.py
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 3264d9afc7ebf3..1d17ae3608a51a 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1581,6 +1581,8 @@ def _wait(self, timeout):
"""Internal implementation of wait() on Windows."""
if timeout is None:
timeout_millis = _winapi.INFINITE
+ elif timeout <= 0:
+ timeout_millis = 0
else:
timeout_millis = int(timeout * 1000)
if self.returncode is None:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 7f7d84214b0e86..ff26e71e2abd33 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -1620,6 +1620,22 @@ def test__use_vfork(self, mock_fork_exec):
subprocess.run([sys.executable, "-c", "pass"])
self.assertFalse(mock_fork_exec.call_args_list[-1].args[-1])
+ @unittest.skipUnless(hasattr(subprocess, '_winapi'),
+ 'need subprocess._winapi')
+ def test_wait_negative_timeout(self):
+ proc = subprocess.Popen(ZERO_RETURN_CMD)
+ with proc:
+ patch = mock.patch.object(
+ subprocess._winapi,
+ 'WaitForSingleObject',
+ return_value=subprocess._winapi.WAIT_OBJECT_0)
+ with patch as mock_wait:
+ proc.wait(-1) # negative timeout
+ mock_wait.assert_called_once_with(proc._handle, 0)
+ proc.returncode = None
+
+ self.assertEqual(proc.wait(), 0)
+
class RunFuncTestCase(BaseTestCase):
def run_python(self, code, **kwargs):
diff --git
a/Misc/NEWS.d/next/Library/2024-03-19-11-08-26.gh-issue-90872.ghys95.rst
b/Misc/NEWS.d/next/Library/2024-03-19-11-08-26.gh-issue-90872.ghys95.rst
new file mode 100644
index 00000000000000..ead68caa9fe88b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-03-19-11-08-26.gh-issue-90872.ghys95.rst
@@ -0,0 +1,3 @@
+On Windows, :meth:`subprocess.Popen.wait` no longer calls
+``WaitForSingleObject()`` with a negative timeout: pass ``0`` ms if the
+timeout is negative. Patch by Victor Stinner.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
