gh-90872: Fix subprocess.Popen.wait() for negative timeout by vstinner · Pull Request #116989 · python/cpython · GitHub
Skip to content

gh-90872: Fix subprocess.Popen.wait() for negative timeout #116989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Mar 19, 2024
+21 −0
Merged

gh-90872: Fix subprocess.Popen.wait() for negative timeout #116989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e29c2aa
gh-90872: Fix subprocess.Popen.wait() for negative timeout
vstinner Mar 19, 2024
d84113e
Add test patching WaitForSingleObject()
vstinner Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lib/subprocess.py
View file
Open in desktop
16 changes: 16 additions & 0 deletions Lib/test/test_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,22 @@ def test_class_getitems(self):
self.assertIsInstance(subprocess.Popen[bytes], types.GenericAlias)
self.assertIsInstance(subprocess.CompletedProcess[str], types.GenericAlias)

@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):
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2024-03-19-11-08-26.gh-issue-90872.ghys95.rst
View file
Open in desktop