From 50b0c84c7c4ffbf8284742eef547f82962dcadd0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 25 Jul 2013 13:47:06 -0700 Subject: [PATCH] Disable usersandbox for tests. --- pym/portage/tests/repoman/test_simple.py | 2 +- pym/portage/tests/resolver/ResolverPlayground.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index fbc75023d..23b0e0a45 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -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: diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index b17917a8a..e09e26535 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -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 -- 2.26.2