summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-03-27 17:26:17 -0700
committerZac Medico <zmedico@gentoo.org>2012-03-27 17:26:17 -0700
commitf7a7a30ee44ced6628163bf33b52b30467d28246 (patch)
tree3845bd3653e90c35691fd76a5d36a22fb6cc79d2
parentea26df1ef9b3dcb7a6a45b487342cc7149a77be5 (diff)
downloadportage-f7a7a30ee44ced6628163bf33b52b30467d28246.tar.gz
portage-f7a7a30ee44ced6628163bf33b52b30467d28246.tar.bz2
portage-f7a7a30ee44ced6628163bf33b52b30467d28246.zip
LockNonblockTestCase: close_fds tweak
Make consistent with commit 144c23efbb4e9565debad03c13c5bcab833a8336.
-rw-r--r--pym/portage/tests/locks/test_lock_nonblock.py5
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 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: