diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 14 | ||||
| -rw-r--r-- | pym/portage/tests/process/test_poll.py | 55 |
2 files changed, 64 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 6f975449a..b111157ea 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1594,6 +1594,8 @@ class PipeReader(AsynchronousTask): __slots__ = ("input_files", "scheduler",) + \ ("pid", "registered", "_reg_ids", "_read_data") + _bufsize = 4096 + def _start(self): self._reg_ids = set() self._read_data = [] @@ -1628,8 +1630,16 @@ class PipeReader(AsynchronousTask): for f in files.itervalues(): if fd == f.fileno(): break - self._read_data.append(f.read()) - if not self._read_data[-1]: + + buf = array.array('B') + try: + buf.fromfile(f, self._bufsize) + except EOFError: + pass + + if buf: + self._read_data.append(buf.tostring()) + else: for f in files.values(): f.close() self.registered = False diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py index 45c0ad03e..e8de967f7 100644 --- a/pym/portage/tests/process/test_poll.py +++ b/pym/portage/tests/process/test_poll.py @@ -3,10 +3,20 @@ # $Id: test_spawn.py 8474 2007-11-09 03:35:38Z zmedico $ import errno, os, sys +import fcntl +import termios +import portage +from portage.output import get_term_size, set_term_size from portage.tests import TestCase from _emerge import PipeReader, SpawnProcess, TaskScheduler -class PollTestCase(TestCase): +class PipeReaderTestCase(TestCase): + + def _create_pipe(self): + return os.pipe() + + def _assertEqual(self, test_string, consumer_value): + self.assertEqual(test_string, consumer_value) def testPipeReader(self): """ @@ -17,7 +27,7 @@ class PollTestCase(TestCase): test_string = 2 * "blah blah blah\n" - master_fd, slave_fd = os.pipe() + master_fd, slave_fd = self._create_pipe() master_file = os.fdopen(master_fd, 'r') task_scheduler = TaskScheduler(max_jobs=2) @@ -40,4 +50,43 @@ class PollTestCase(TestCase): producer.addStartListener(producer_start_cb) task_scheduler.run() - self.assertEqual(test_string, consumer.getvalue()) + self._assertEqual(test_string, consumer.getvalue()) + +class PtyReaderTestCase(PipeReaderTestCase): + + def _assertEqual(self, test_string, consumer_value): + if test_string != consumer_value: + # This test is expected to fail on some operating systems + # such as Darwin that do not support poll() on pty devices. + self.todo = True + self.assertEqual(test_string, consumer_value) + + def _create_pipe(self): + got_pty = False + + if portage._disable_openpty: + master_fd, slave_fd = os.pipe() + else: + from pty import openpty + try: + master_fd, slave_fd = openpty() + got_pty = True + except EnvironmentError, e: + portage._disable_openpty = True + portage.writemsg("openpty failed: '%s'\n" % str(e), + noiselevel=-1) + del e + master_fd, slave_fd = os.pipe() + + if got_pty: + # Disable post-processing of output since otherwise weird + # things like \n -> \r\n transformations may occur. + mode = termios.tcgetattr(slave_fd) + mode[1] &= ~termios.OPOST + termios.tcsetattr(slave_fd, termios.TCSANOW, mode) + + if got_pty and sys.stdout.isatty(): + rows, columns = get_term_size() + set_term_size(rows, columns, slave_fd) + + return (master_fd, slave_fd) |