aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-02-11 19:03:16 -0800
committerZac Medico <zmedico@gentoo.org>2013-02-11 19:03:16 -0800
commit8d53cd7227f6e0187a743b617746168ed28e895e (patch)
treeca94357be1d07a16a5229370fe1420983430ed55
parentBacktrack unsatisfied slot-operator, bug #456340. (diff)
downloadportage-8d53cd7227f6e0187a743b617746168ed28e895e.tar.gz
portage-8d53cd7227f6e0187a743b617746168ed28e895e.tar.bz2
portage-8d53cd7227f6e0187a743b617746168ed28e895e.zip
SlotOperatorUnsolvedTestCase: add unwanted binpkg
-rw-r--r--pym/portage/tests/resolver/test_slot_operator_unsolved.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/test_slot_operator_unsolved.py b/pym/portage/tests/resolver/test_slot_operator_unsolved.py
index 7ae3d9e28..c19783ddf 100644
--- a/pym/portage/tests/resolver/test_slot_operator_unsolved.py
+++ b/pym/portage/tests/resolver/test_slot_operator_unsolved.py
@@ -37,6 +37,14 @@ class SlotOperatorUnsolvedTestCase(TestCase):
},
}
+ binpkgs = {
+ "net-libs/webkit-gtk-1.10.2-r300" : {
+ "EAPI": "5",
+ "DEPEND": ">=dev-libs/icu-3.8.1-r1:0/50=",
+ "RDEPEND": ">=dev-libs/icu-3.8.1-r1:0/50="
+ },
+ }
+
installed = {
"dev-libs/icu-50.1.2" : {
"EAPI": "5",
@@ -59,7 +67,7 @@ class SlotOperatorUnsolvedTestCase(TestCase):
ResolverPlaygroundTestCase(
["@world"],
- options = {"--update": True, "--deep": True},
+ options = {"--update": True, "--deep": True, "--usepkg": True},
circular_dependency_solutions = {
'dev-ruby/hoe-2.13.0': frozenset([frozenset([('test', False)])]),
'dev-ruby/rdoc-3.12.1': frozenset([frozenset([('test', False)])])
@@ -69,7 +77,7 @@ class SlotOperatorUnsolvedTestCase(TestCase):
)
- playground = ResolverPlayground(ebuilds=ebuilds,
+ playground = ResolverPlayground(ebuilds=ebuilds, binpkgs=binpkgs,
installed=installed, user_config=user_config,
world=world, debug=False)
try: