changeset:   101345:816e1fe72c1e
user:        Martin Panter <vadmium+py@gmail.com>
date:        Sun May 15 13:21:25 2016 +0000
files:       Lib/test/test_readline.py
description:
Issue #26870: Avoid using kqueue() with pseudo-terminals

Also force terminate the child process in case it hangs for any reason.


diff -r 29b470b8ab77 -r 816e1fe72c1e Lib/test/test_readline.py
--- a/Lib/test/test_readline.py	Sun May 15 12:27:16 2016 +0300
+++ b/Lib/test/test_readline.py	Sun May 15 13:21:25 2016 +0000
@@ -9,7 +9,7 @@
 import sys
 import tempfile
 import unittest
-from test.support import import_module, unlink, get_original_stdout
+from test.support import import_module, unlink
 from test.support.script_helper import assert_python_ok
 
 # Skip tests if there is no readline module
@@ -126,30 +126,30 @@
     os.close(slave)
     with ExitStack() as cleanup:
         cleanup.enter_context(proc)
+        cleanup.callback(proc.terminate)
         cleanup.callback(os.close, master)
-        sel = cleanup.enter_context(selectors.DefaultSelector())
+        # Avoid using DefaultSelector, because it may choose a kqueue()
+        # implementation, which does not work with pseudo-terminals on OS X
+        # < 10.9 (Issue 20365) and Open BSD (Issue 20667).
+        sel = getattr(selectors, "PollSelector", selectors.DefaultSelector)()
+        cleanup.enter_context(sel)
         sel.register(master, selectors.EVENT_READ | selectors.EVENT_WRITE)
         os.set_blocking(master, False)
         while True:
-            get_original_stdout().write(f"test_readline: select()\n")
             for [_, events] in sel.select():
                 if events & selectors.EVENT_READ:
                     try:
-                        get_original_stdout().write(f"test_readline: read()\n")
                         chunk = os.read(master, 0x10000)
                     except OSError as err:
                         # Linux raises EIO when the slave is closed
                         if err.errno != EIO:
                             raise
                         chunk = b""
-                    get_original_stdout().write(f"test_readline: read {chunk!r}\n")
                     if not chunk:
                         return output
                     output.extend(chunk)
                 if events & selectors.EVENT_WRITE:
-                    get_original_stdout().write(f"test_readline: write()\n")
                     input = input[os.write(master, input):]
-                    get_original_stdout().write(f"test_readline: remaining input = {input!r}\n")
                     if not input:
                         sel.modify(master, selectors.EVENT_READ)