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 1SCgin-0002Qe-3T for garchives@archives.gentoo.org; Wed, 28 Mar 2012 00:26:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF5F5E09B6; Wed, 28 Mar 2012 00:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8CC2FE09B6 for ; Wed, 28 Mar 2012 00:26:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C96BF1B400D for ; Wed, 28 Mar 2012 00:26:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 94069E5402 for ; Wed, 28 Mar 2012 00:26:31 +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: <1332894377.f7a7a30ee44ced6628163bf33b52b30467d28246.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/locks/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/locks/test_lock_nonblock.py X-VCS-Directories: pym/portage/tests/locks/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: f7a7a30ee44ced6628163bf33b52b30467d28246 X-VCS-Branch: master Date: Wed, 28 Mar 2012 00:26:31 +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: 4e53e862-1bf4-44ed-a675-79addf31627c X-Archives-Hash: f1740805ed9c73702a1a0d38dd0aba64 commit: f7a7a30ee44ced6628163bf33b52b30467d28246 Author: Zac Medico gentoo org> AuthorDate: Wed Mar 28 00:26:17 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 28 00:26:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Df7a7a30e LockNonblockTestCase: close_fds tweak Make consistent with commit 144c23efbb4e9565debad03c13c5bcab833a8336. --- pym/portage/tests/locks/test_lock_nonblock.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/locks/test_lock_nonblock.py b/pym/portage/= tests/locks/test_lock_nonblock.py index 17f854d..2ff7b35 100644 --- a/pym/portage/tests/locks/test_lock_nonblock.py +++ b/pym/portage/tests/locks/test_lock_nonblock.py @@ -18,7 +18,10 @@ class LockNonblockTestCase(TestCase): lock1 =3D portage.locks.lockfile(path) pid =3D os.fork() if pid =3D=3D 0: - portage.process._setup_pipes({0:0, 1:1, 2:2}) + portage.locks._close_fds() + # Disable close_fds since we don't exec + # (see _setup_pipes docstring). + portage.process._setup_pipes({0:0, 1:1, 2:2}, close_fds=3DFalse) rval =3D 2 try: try: