diff options
Diffstat (limited to 'Lib/test/test_pty.py')
| -rw-r--r-- | Lib/test/test_pty.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 4d471d534e..29297f8841 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -205,6 +205,7 @@ class SmallPtyTests(unittest.TestCase): self.orig_stdout_fileno = pty.STDOUT_FILENO self.orig_pty_select = pty.select self.fds = [] # A list of file descriptors to close. + self.files = [] self.select_rfds_lengths = [] self.select_rfds_results = [] @@ -212,6 +213,11 @@ class SmallPtyTests(unittest.TestCase): pty.STDIN_FILENO = self.orig_stdin_fileno pty.STDOUT_FILENO = self.orig_stdout_fileno pty.select = self.orig_pty_select + for file in self.files: + try: + file.close() + except OSError: + pass for fd in self.fds: try: os.close(fd) @@ -223,6 +229,11 @@ class SmallPtyTests(unittest.TestCase): self.fds.extend(pipe_fds) return pipe_fds + def _socketpair(self): + socketpair = socket.socketpair() + self.files.extend(socketpair) + return socketpair + 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)) @@ -234,9 +245,7 @@ class SmallPtyTests(unittest.TestCase): pty.STDOUT_FILENO = mock_stdout_fd mock_stdin_fd, write_to_stdin_fd = self._pipe() pty.STDIN_FILENO = mock_stdin_fd - socketpair = socket.socketpair() - for s in socketpair: - self.addCleanup(s.close) + socketpair = self._socketpair() masters = [s.fileno() for s in socketpair] # Feed data. Smaller than PIPEBUF. These writes will not block. @@ -264,9 +273,7 @@ class SmallPtyTests(unittest.TestCase): pty.STDOUT_FILENO = mock_stdout_fd mock_stdin_fd, write_to_stdin_fd = self._pipe() pty.STDIN_FILENO = mock_stdin_fd - socketpair = socket.socketpair() - for s in socketpair: - self.addCleanup(s.close) + socketpair = self._socketpair() masters = [s.fileno() for s in socketpair] os.close(masters[1]) |