# Distributed under the terms of the GNU General Public License v2
import array
+import errno
import logging
+import os
from portage.util import writemsg_level
from _emerge.AsynchronousTask import AsynchronousTask
def isAlive(self):
return bool(self._registered)
- def _read_buf(self, f, event):
+ def _read_buf(self, fd, event):
"""
| POLLIN | RETURN
| BIT | VALUE
| ---------------------------------------------------
| 0 | None
"""
+ # NOTE: array.fromfile() is no longer used here because it has
+ # bugs in all known versions of Python (including Python 2.7
+ # and Python 3.2).
buf = None
if event & PollConstants.POLLIN:
buf = array.array('B')
try:
- buf.fromfile(f, self._bufsize)
- except (EOFError, IOError):
- pass
+ # Python >=3.2
+ frombytes = buf.frombytes
+ except AttributeError:
+ frombytes = buf.fromstring
+ try:
+ frombytes(os.read(fd, self._bufsize))
+ except OSError as e:
+ # EIO happens with pty on Linux after the
+ # slave end of the pty has been closed.
+ if e.errno not in (errno.EAGAIN, errno.EIO):
+ raise
+ buf = None
+
return buf
def _unregister(self):
def _output_handler(self, fd, event):
files = self._files
- buf = self._read_buf(files.process, event)
+ while True:
+ buf = self._read_buf(fd, event)
- if buf is not None:
+ if buf is None:
+ # not a POLLIN event, EAGAIN, etc...
+ break
- if buf:
+ if not buf:
+ # EOF
+ self._unregister()
+ self.wait()
+ break
+
+ else:
if not self.background:
write_successful = False
failures = 0
data = buf.tostring()
files.log.write(data)
files.log.flush()
- else:
- self._unregister()
- self.wait()
self._unregister_if_appropriate(event)
monitor the process from inside a poll() loop.
"""
- buf = self._read_buf(self._files.process, event)
+ while True:
+ buf = self._read_buf(fd, event)
- if buf is not None:
+ if buf is None:
+ # not a POLLIN event, EAGAIN, etc...
+ break
- if buf:
- pass
- else:
+ if not buf:
+ # EOF
self._unregister()
self.wait()
+ break
self._unregister_if_appropriate(event)
# Copyright 1998-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+import tempfile
+
from portage import os
from portage.tests import TestCase
from portage.util._pty import _create_pty_or_pipe
from _emerge.PipeReader import PipeReader
from _emerge.SpawnProcess import SpawnProcess
+class _SpawnProcessPty(SpawnProcess):
+ __slots__ = ("got_pty",)
+ def _pipe(self, fd_pipes):
+ got_pty, master_fd, slave_fd = _create_pty_or_pipe()
+ self.got_pty = got_pty
+ return (master_fd, slave_fd)
+
class PipeReaderTestCase(TestCase):
def _testPipeReader(self, test_string, use_pty):
output = consumer.getvalue().decode('ascii', 'replace')
return (output, got_pty)
+ def _testPipeReaderArray(self, test_string, use_pty):
+ """
+ Use a poll loop to read data from a pipe and assert that
+ the data written to the pipe is identical to the data
+ read from the pipe.
+ """
+
+ scheduler = PollScheduler().sched_iface
+ if use_pty:
+ spawn_process = _SpawnProcessPty
+ else:
+ spawn_process = SpawnProcess
+
+ fd, logfile = tempfile.mkstemp()
+ os.close(fd)
+ producer = spawn_process(
+ background=True,
+ args=["bash", "-c", "echo -n '%s'" % test_string],
+ env=os.environ,
+ scheduler=scheduler, logfile=logfile)
+
+ try:
+ producer.start()
+ scheduler.schedule()
+ self.assertEqual(producer.returncode, os.EX_OK)
+
+ if use_pty:
+ got_pty = producer.got_pty
+ else:
+ got_pty = False
+
+ with open(logfile, 'rb') as f:
+ output = f.read().decode('ascii')
+ return (output, got_pty)
+ finally:
+ try:
+ os.unlink(logfile)
+ except OSError:
+ pass
+
def testPipeReader(self):
for use_pty in (False, True):
- for x in (1, 2, 5, 6, 7, 8, 2**5, 2**10, 2**12, 2**13, 2**14):
- test_string = x * "a"
- output, got_pty = self._testPipeReader(test_string, use_pty)
- self.assertEqual(test_string, output,
- "x = %s, use_pty = %s, got_pty = %s" % (x, use_pty, got_pty))
+ for use_array in (False, True):
+ for x in (1, 2, 5, 6, 7, 8, 2**5, 2**10, 2**12, 2**13, 2**14):
+ test_string = x * "a"
+ if use_array:
+ method = self._testPipeReaderArray
+ else:
+ method = self._testPipeReader
+ output, got_pty = method(test_string, use_pty)
+ self.assertEqual(test_string, output,
+ "x = %s, len(output) = %s, use_array = %s, "
+ "use_pty = %s, got_pty = %s" %
+ (x, len(output), use_array, use_pty, got_pty))
projects / portage.git / commitdiff