No more failing UI tests! (#1857)

* Better debug for UI tests

* No more failing UI tests!

Author: Arusekk

pwnlib/term/term.py

@@ -2,6 +2,7 @@
 from __future__ import division
 
 import atexit
+import errno
 import os
 import re
 import signal
@@ -110,7 +111,12 @@ def init():
     fd.flush()
     s = ''
     while True:
-        c = os.read(fd.fileno(), 1)
+        try:
+            c = os.read(fd.fileno(), 1)
+        except OSError as e:
+            if e.errno != errno.EINTR:
+                raise
+            continue
         if not isinstance(c, six.string_types):
             c = c.decode('utf-8')
         s += c

pwnlib/ui.py

@@ -28,10 +28,16 @@ def handleusr1(sig, frame):
         s = p.stderr.read()
         log.error("child process failed:\n%s", s.decode())
     signal.signal(signal.SIGUSR1, handleusr1)
-    cmd = """
-from pwn import *
+    cmd = """\
+import os
 import signal
-atexception.register(lambda:os.kill(os.getppid(), signal.SIGUSR1))
+import sys
+_ehook = sys.excepthook
+def ehook(*args):
+    _ehook(*args)
+    os.kill(os.getppid(), signal.SIGUSR1)
+sys.excepthook = ehook
+from pwn import *
 """ + cmd
     if "coverage" in sys.modules:
         cmd = "import coverage; coverage.process_startup()\n" + cmd
@@ -41,6 +47,7 @@ def handleusr1(sig, frame):
         p.recvuntil(b"\33[6n")
     except EOFError:
         raise EOFError("process terminated with code: %r (%r)" % (p.poll(True), p.stderr.read()))
+    # late initialization can lead to EINTR in many places
     fcntl.ioctl(p.stdout.fileno(), termios.TIOCSWINSZ, struct.pack("hh", 80, 80))
     p.stdout.write(b"\x1b[1;1R")
     time.sleep(0.5)