Skip to content

bpo-41818: Close file descriptors in test_openpty #24119

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
encukou merged 3 commits into from
Jan 19, 2021
Merged

bpo-41818: Close file descriptors in test_openpty #24119

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c24e78d
bpo-41818: Close file descriptors in test_openpty
encukou Jan 5, 2021
b7eb9e8
Instead of the big indent, use self.addCleanup
encukou Jan 5, 2021
494fd7b
Clean up also in test_master_read and test_fork
encukou Jan 12, 2021
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
Prev Previous commit
Clean up also in test_master_read and test_fork
  • Loading branch information
@encukou
encukou committed Jan 12, 2021
commit 494fd7b9f4e52ef8f2dd54acbb8822ea04dc8c6d
8 changes: 4 additions & 4 deletions Lib/test/test_pty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ def _set_term_winsz(fd, winsz):

# Marginal testing of pty suite. Cannot do extensive 'do or fail' testing
# because pty code is not too portable.
# XXX(nnorwitz): these tests leak fds when there is an error.
class PtyTest(unittest.TestCase):
def setUp(self):
old_alarm = signal.signal(signal.SIGALRM, self.handle_sig)
Expand Down Expand Up @@ -227,6 +226,7 @@ def test_openpty(self):
def test_fork(self):
debug("calling pty.fork()")
pid, master_fd = pty.fork()
self.addCleanup(os.close, master_fd)
if pid == pty.CHILD:
# stdout should be connected to a tty.
if not os.isatty(1):
Expand Down Expand Up @@ -305,13 +305,14 @@ def test_fork(self):
##else:
## raise TestFailed("Read from master_fd did not raise exception")

os.close(master_fd)

def test_master_read(self):
# XXX(nnorwitz): this test leaks fds when there is an error.
debug("Calling pty.openpty()")
master_fd, slave_fd = pty.openpty()
debug(f"Got master_fd '{master_fd}', slave_fd '{slave_fd}'")

self.addCleanup(os.close, master_fd)

debug("Closing slave_fd")
os.close(slave_fd)

Expand All @@ -321,7 +322,6 @@ def test_master_read(self):
except OSError: # Linux
data = b""

os.close(master_fd)
self.assertEqual(data, b"")

class SmallPtyTests(unittest.TestCase):
Expand Down