mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

gh-96522: Fix deadlock in pty.spawn (#96639)

Browse source
This commit is contained in:
Youfu Zhang 2023-05-19 21:22:43 +08:00 • committed by GitHub
parent c26d03d5d6
commit 9c5aa8967b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_pty.py
View file

@ -312,8 +312,8 @@ class SmallPtyTests(unittest.TestCase):
self.orig_pty_waitpid = pty.waitpid
self.fds = [] # A list of file descriptors to close.
self.files = []
self.select_rfds_lengths = []
self.select_rfds_results = []
self.select_input = []
self.select_output = []
self.tcsetattr_mode_setting = None
def tearDown(self):
@ -350,8 +350,8 @@ class SmallPtyTests(unittest.TestCase):
def _mock_select(self, rfds, wfds, xfds):
# This will raise IndexError when no more expected calls exist.
self.assertEqual(self.select_rfds_lengths.pop(0), len(rfds))
return self.select_rfds_results.pop(0), [], []
self.assertEqual((rfds, wfds, xfds), self.select_input.pop(0))
return self.select_output.pop(0)
def _make_mock_fork(self, pid):
def mock_fork():
@ -374,11 +374,13 @@ class SmallPtyTests(unittest.TestCase):
os.write(masters[1], b'from master')
os.write(write_to_stdin_fd, b'from stdin')
# Expect two select calls, the last one will cause IndexError
# Expect three select calls, the last one will cause IndexError
pty.select = self._mock_select
self.select_rfds_lengths.append(2)
self.select_rfds_results.append([mock_stdin_fd, masters[0]])
self.select_rfds_lengths.append(2)
self.select_input.append(([mock_stdin_fd, masters[0]], [], []))
self.select_output.append(([mock_stdin_fd, masters[0]], [], []))
self.select_input.append(([mock_stdin_fd, masters[0]], [mock_stdout_fd, masters[0]], []))
self.select_output.append(([], [mock_stdout_fd, masters[0]], []))
self.select_input.append(([mock_stdin_fd, masters[0]], [], []))
with self.assertRaises(IndexError):
pty._copy(masters[0])