summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-05 13:34:47 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-05 13:37:33 -0700
commit81821e3626dba0319c37527c823a99b5254b7847 (patch)
treeb1c2e6484d098abcf4ec28e34db7bef4fb41b480
parenta082e60d36af81d908e1fa185032c5da1e270375 (diff)
downloadportage-81821e3626dba0319c37527c823a99b5254b7847.tar.gz
portage-81821e3626dba0319c37527c823a99b5254b7847.tar.bz2
portage-81821e3626dba0319c37527c823a99b5254b7847.zip
Add a fake _test_ option to myopts that can be used for conditional test code.
-rw-r--r--pym/_emerge/depgraph.py6
-rw-r--r--pym/portage/tests/resolver/ResolverPlayground.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 150048215..cc697ccf7 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -66,10 +66,10 @@ class _frozen_depgraph_config(object):
if settings.get("PORTAGE_DEBUG", "") == "1":
self.edebug = 1
self.spinner = spinner
- if "/" in trees:
- self._running_root = trees["/"]["root_config"]
- else:
+ if "_test_" in myopts and "/" not in trees:
self._running_root = trees[self.target_root]["root_config"]
+ else:
+ self._running_root = trees["/"]["root_config"]
self._opts_no_restart = frozenset(["--buildpkgonly",
"--fetchonly", "--fetch-all-uri", "--pretend"])
self.pkgsettings = {}
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 9034deb88..a9954fef1 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -180,6 +180,9 @@ class ResolverPlayground(object):
myopts["--root"] = self.root
myopts["--config-root"] = self.root
myopts["--root-deps"] = "rdeps"
+ # Add a fake _test_ option that can be used for
+ # conditional test code.
+ myopts["_test_"] = True
portage.util.noiselimit = -2
myparams = create_depgraph_params(myopts, myaction)