diff options
| -rw-r--r-- | Lib/test/test_pty.py | 18 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 02290be..e69d7ea 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -115,6 +115,24 @@ if pid == pty.CHILD: 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()', @@ -17,6 +17,9 @@ Library - tarfile.py: Fix directory names to have only one trailing slash. +- Fix test_pty.py to not hang on OS X (and theoretically other *nixes) when + run in verbose mode. + What's New in Python 2.5.1? ============================= |