https://github.com/python/cpython/commit/7a470541e2bbc6f3e87a6d813e2ec42cf726de7a
commit: 7a470541e2bbc6f3e87a6d813e2ec42cf726de7a
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-01-27T18:38:17+02:00
summary:
gh-114100: Remove superfluous writing to fd 1 in test_pty (GH-114647)
files:
M Lib/test/test_pty.py
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index f31a68c5d84e03..51e3a46d0df178 100644
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -1,4 +1,5 @@
from test.support import verbose, reap_children
+from test.support.os_helper import TESTFN, unlink
from test.support.import_helper import import_module
# Skip these tests if termios or fcntl are not available
@@ -292,7 +293,26 @@ def test_master_read(self):
self.assertEqual(data, b"")
def test_spawn_doesnt_hang(self):
- pty.spawn([sys.executable, '-c', 'print("hi there")'])
+ self.addCleanup(unlink, TESTFN)
+ with open(TESTFN, 'wb') as f:
+ STDOUT_FILENO = 1
+ dup_stdout = os.dup(STDOUT_FILENO)
+ os.dup2(f.fileno(), STDOUT_FILENO)
+ buf = b''
+ def master_read(fd):
+ nonlocal buf
+ data = os.read(fd, 1024)
+ buf += data
+ return data
+ try:
+ pty.spawn([sys.executable, '-c', 'print("hi there")'],
+ master_read)
+ finally:
+ os.dup2(dup_stdout, STDOUT_FILENO)
+ os.close(dup_stdout)
+ self.assertEqual(buf, b'hi there\r\n')
+ with open(TESTFN, 'rb') as f:
+ self.assertEqual(f.read(), b'hi there\r\n')
class SmallPtyTests(unittest.TestCase):
"""These tests don't spawn children or hang."""
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
