From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Mar 2012 00:26:17 +0000 (-0700)
Subject: LockNonblockTestCase: close_fds tweak
X-Git-Tag: v2.2.0_alpha96~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7a7a30ee44ced6628163bf33b52b30467d28246;p=portage.git

LockNonblockTestCase: close_fds tweak

Make consistent with commit 144c23efbb4e9565debad03c13c5bcab833a8336.
---

diff --git a/pym/portage/tests/locks/test_lock_nonblock.py b/pym/portage/tests/locks/test_lock_nonblock.py
index 17f854dbe..2ff7b3527 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 = portage.locks.lockfile(path)
 			pid = os.fork()
 			if pid == 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=False)
 				rval = 2
 				try:
 					try: