summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Ward <ian@excess.org>2017-07-04 08:46:45 -0400
committerGitHub <noreply@github.com>2017-07-04 08:46:45 -0400
commitb44ce386c981c7e7ff344db3973d3c69a8244a56 (patch)
tree001b20d3ee5252bb96a1db064ce72fd6427e94dd
parentfa86c560d390253de77a96767006e0fd3d3ad7e6 (diff)
parentf68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 (diff)
downloadurwid-b44ce386c981c7e7ff344db3973d3c69a8244a56.tar.gz
Merge pull request #237 from floppym/test-vterm-EINTR
test_vterm: handle EINTR when reading from pipe
-rw-r--r--urwid/tests/test_vterm.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
index 4dadfcc..075c653 100644
--- a/urwid/tests/test_vterm.py
+++ b/urwid/tests/test_vterm.py
@@ -18,6 +18,7 @@
#
# Urwid web site: http://excess.org/urwid/
+import errno
import os
import sys
import unittest
@@ -28,7 +29,6 @@ from urwid import vterm
from urwid import signals
from urwid.compat import B
-
class DummyCommand(object):
QUITSTRING = B('|||quit|||')
@@ -41,12 +41,20 @@ class DummyCommand(object):
stdout.write(B('\x1bc'))
while True:
- data = os.read(self.reader, 1024)
+ data = self.read(1024)
if self.QUITSTRING == data:
break
stdout.write(data)
stdout.flush()
+ def read(self, size):
+ while True:
+ try:
+ return os.read(self.reader, size)
+ except OSError as e:
+ if e.errno != errno.EINTR:
+ raise
+
def write(self, data):
os.write(self.writer, data)