[Python-checkins] r54839 - python/branches/release25-maint/Lib/test/test_pty.py
neal.norwitz
python-checkins at python.org
Mon Apr 16 08:20:14 CEST 2007
Author: neal.norwitz
Date: Mon Apr 16 08:20:14 2007
New Revision: 54839
Modified:
python/branches/release25-maint/Lib/test/test_pty.py
Log:
Revert 54805 for 2.5.1 release. Can be applied after 2.5 branch is unfrozen.
Modified: python/branches/release25-maint/Lib/test/test_pty.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_pty.py (original)
+++ python/branches/release25-maint/Lib/test/test_pty.py Mon Apr 16 08:20:14 2007
@@ -115,24 +115,6 @@
os._exit(4)
else:
debug("Waiting for child (%d) to finish."%pid)
- # In verbose mode, we have to consume the debug output from the child or
- # the child will block, causing this test to hang in the parent's
- # waitpid() call. The child blocks after a platform-dependent amount of
- # data is written to its fd. On Linux 2.6, it's 4000 bytes and the child
- # won't block, but on OS X even the small writes in the child above will
- # block it. Also on Linux, the read() will throw an OSError (input/output
- # error) when it tries to read past the end of the buffer but the child's
- # already exited, so catch and discard those exceptions. It's not worth
- # checking for EIO.
- while True:
- try:
- data = os.read(master_fd, 80)
- except OSError:
- break
- if not data:
- break
- sys.stdout.write(data.replace('\r\n', '\n'))
-
##line = os.read(master_fd, 80)
##lines = line.replace('\r\n', '\n').split('\n')
##if False and lines != ['In child, calling os.setsid()',
More information about the Python-checkins
mailing list