Merge d57a6d9 into 4507924

pexpect · May 21, 2018 · abfbe9b · abfbe9b
2 parents 4507924 + d57a6d9
commit abfbe9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pexpect/utils.py b/pexpect/utils.py
@@ -165,7 +165,7 @@ def poll_ignore_interrupts(fds, timeout=None):
 
     poller = select.poll()
     for fd in fds:
-        poller.register(fd)
+        poller.register(fd, select.POLLIN | select.POLLPRI | select.POLLHUP | select.POLLERR)
 
     while True:
         try:

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -87,6 +87,12 @@ def test_read_poll(self):
         remaining = child.read().replace(_CAT_EOF, b'')
         self.assertEqual(remaining, b'abc\r\n')
 
+    def test_read_poll_timeout(self):
+        " Test use_poll properly times out "
+        child = pexpect.spawn('sleep 5', use_poll=True)
+        with self.assertRaises(pexpect.TIMEOUT):
+            child.expect(pexpect.EOF, timeout=1)
+
     def test_readline_bin_echo(self):
         " Test spawn('echo'). "
         # given,