From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RbL9e-00049i-8X for garchives@archives.gentoo.org; Thu, 15 Dec 2011 23:56:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C31A621C038; Thu, 15 Dec 2011 23:55:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7FFEC21C038 for ; Thu, 15 Dec 2011 23:55:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0811D1B4079 for ; Thu, 15 Dec 2011 23:55:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 33F988004A for ; Thu, 15 Dec 2011 23:55:51 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <915348ce34fc499ac295b8f0ffee9f0829803542.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/process/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PipeReader.py pym/portage/tests/process/test_poll.py X-VCS-Directories: pym/portage/tests/process/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 915348ce34fc499ac295b8f0ffee9f0829803542 Date: Thu, 15 Dec 2011 23:55:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b4c99809-7e0d-4b59-b118-c06209718110 X-Archives-Hash: b6a3100c890105503a4addeb9cd51f44 commit: 915348ce34fc499ac295b8f0ffee9f0829803542 Author: Zac Medico gentoo org> AuthorDate: Thu Dec 15 23:55:42 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Dec 15 23:55:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D915348ce test_poll: test different sizes, and pty too --- pym/_emerge/PipeReader.py | 4 +++- pym/portage/tests/process/test_poll.py | 23 +++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index af8cfdd..78acb72 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -64,7 +64,9 @@ class PipeReader(AbstractPollTask): try: data =3D os.read(fd, self._bufsize) except OSError as e: - if e.errno not in (errno.EAGAIN,): + # 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 break else: diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/p= rocess/test_poll.py index c3b50d4..e7a4702 100644 --- a/pym/portage/tests/process/test_poll.py +++ b/pym/portage/tests/process/test_poll.py @@ -3,25 +3,28 @@ =20 from portage import os from portage.tests import TestCase +from portage.util._pty import _create_pty_or_pipe from _emerge.PollScheduler import PollScheduler from _emerge.PipeReader import PipeReader from _emerge.SpawnProcess import SpawnProcess =20 class PipeReaderTestCase(TestCase): =20 - def testPipeReader(self): + def _testPipeReader(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. """ =20 - test_string =3D 2 * "blah blah blah\n" - scheduler =3D PollScheduler().sched_iface - master_fd, slave_fd =3D os.pipe() + if use_pty: + got_pty, master_fd, slave_fd =3D _create_pty_or_pipe() + else: + got_pty =3D False + master_fd, slave_fd =3D os.pipe() master_file =3D os.fdopen(master_fd, 'rb', 0) - slave_file =3D os.fdopen(slave_fd, 'wb') + slave_file =3D os.fdopen(slave_fd, 'wb', 0) producer =3D SpawnProcess( args=3D["bash", "-c", "echo -n '%s'" % test_string], env=3Dos.environ, fd_pipes=3D{1:slave_fd}, @@ -44,4 +47,12 @@ class PipeReaderTestCase(TestCase): self.assertEqual(consumer.returncode, os.EX_OK) =20 output =3D consumer.getvalue().decode('ascii', 'replace') - self.assertEqual(test_string, output) + return (output, got_pty) + + 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 =3D x * "a" + output, got_pty =3D self._testPipeReader(test_string, use_pty) + self.assertEqual(test_string, output, + "x =3D %s, use_pty =3D %s, got_pty =3D %s" % (x, use_pty, got_pty))