diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-12-11 13:00:28 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-12-11 13:00:28 -0800 |
| commit | bffe72d567e2d4d4235ad45177fbec04da5260fa (patch) | |
| tree | 976a80cd8a6a6d5e286ea5ac59aaf00a0d484002 | |
| parent | 0654d66ccead49eb7d5edf2df189bfe77773b89e (diff) | |
| download | portage-bffe72d567e2d4d4235ad45177fbec04da5260fa.tar.gz portage-bffe72d567e2d4d4235ad45177fbec04da5260fa.tar.bz2 portage-bffe72d567e2d4d4235ad45177fbec04da5260fa.zip | |
Don't nest sandbox in emerge/repoman tests.
| -rw-r--r-- | pym/portage/tests/emerge/test_simple.py | 3 | ||||
| -rw-r--r-- | pym/portage/tests/repoman/test_simple.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 5177229ac..a3efa62ca 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -267,7 +267,8 @@ pkg_preinst() { user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH) features = [] - if not portage.process.sandbox_capable: + if not portage.process.sandbox_capable or \ + os.environ.get("SANDBOX_ON") == "1": features.append("-sandbox") # Since egencache ignores settings from the calling environment, diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 3643ff2d7..eab06d9b8 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -196,6 +196,10 @@ class SimpleRepomanTestCase(TestCase): "PYTHONPATH" : pythonpath, } + if os.environ.get("SANDBOX_ON") == "1": + # avoid problems from nested sandbox instances + env["FEATURES"] = "-sandbox" + dirs = [homedir, license_dir, profiles_dir, distdir] try: for d in dirs: |