From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Jun 2007 12:16:49 +0000 (-0000)
Subject: Fix the test so that it can run inside a sandbox.
X-Git-Tag: v2.2_pre1~1202
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8b8fd2c44ebcde74c38ac9a04acc564cf3409909;p=portage.git

Fix the test so that it can run inside a sandbox.

svn path=/main/trunk/; revision=6915
---

diff --git a/pym/portage/tests/ebuild/test_spawn.py b/pym/portage/tests/ebuild/test_spawn.py
index 66e8f9ea7..c694566f2 100644
--- a/pym/portage/tests/ebuild/test_spawn.py
+++ b/pym/portage/tests/ebuild/test_spawn.py
@@ -16,8 +16,10 @@ class SpawnTestCase(TestCase):
 			os.close(fd)
 			null_fd = os.open('/dev/null', os.O_RDWR)
 			test_string = 2 * "blah blah blah\n"
+			# use free=1 to disable sandbox so that this test can run inside a
+			# sandbox (sandbox in sandbox is not currently allowed)
 			spawn("echo -n '%s'" % test_string, settings, logfile=logfile,
-				fd_pipes={0:sys.stdin.fileno(), 1:null_fd, 2:null_fd})
+				free=1, fd_pipes={0:sys.stdin.fileno(), 1:null_fd, 2:null_fd})
 			os.close(null_fd)
 			f = open(logfile, 'r')
 			log_content = f.read()