Disable usersandbox for tests.
authorZac Medico <zmedico@gentoo.org>
Thu, 25 Jul 2013 20:47:06 +0000 (13:47 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 25 Jul 2013 20:47:06 +0000 (13:47 -0700)
pym/portage/tests/repoman/test_simple.py
pym/portage/tests/resolver/ResolverPlayground.py

index fbc75023d3f644d2625cfa8911805a5e9046751a..23b0e0a4538f21f64f753e41a23339b11244fe41 100644 (file)
@@ -234,7 +234,7 @@ class SimpleRepomanTestCase(TestCase):
 
                if os.environ.get("SANDBOX_ON") == "1":
                        # avoid problems from nested sandbox instances
-                       env["FEATURES"] = "-sandbox"
+                       env["FEATURES"] = "-sandbox -usersandbox"
 
                dirs = [homedir, license_dir, profiles_dir, distdir]
                try:
index b17917a8acf800036eafa4a7917a1a1bbb43a5de..e09e2653570b63b68bbf3fecf022f7691b20f809 100644 (file)
@@ -395,7 +395,7 @@ class ResolverPlayground(object):
                if not portage.process.sandbox_capable or \
                        os.environ.get("SANDBOX_ON") == "1":
                        # avoid problems from nested sandbox instances
-                       make_conf_lines.append('FEATURES="${FEATURES} -sandbox"')
+                       make_conf_lines.append('FEATURES="${FEATURES} -sandbox -usersandbox"')
 
                configs = user_config.copy()
                configs["make.conf"] = make_conf_lines