Fix ResourceWarnings in test_pty

This commit is contained in:
Antoine Pitrou 2012-12-16 16:09:11 +01:00
parent 5461558d1a
commit 697ce5560f
1 changed files with 5 additions and 3 deletions

View File

@ -215,7 +215,7 @@ class SmallPtyTests(unittest.TestCase):
for fd in self.fds:
try:
os.close(fd)
except:
except OSError:
pass
def _pipe(self):
@ -235,8 +235,9 @@ class SmallPtyTests(unittest.TestCase):
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)
masters = [s.fileno() for s in socketpair]
self.fds.extend(masters)
# Feed data. Smaller than PIPEBUF. These writes will not block.
os.write(masters[1], b'from master')
@ -264,8 +265,9 @@ class SmallPtyTests(unittest.TestCase):
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)
masters = [s.fileno() for s in socketpair]
self.fds.extend(masters)
os.close(masters[1])
socketpair[1].close()