summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/tests/resolver/test_slot_collisions.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/pym/portage/tests/resolver/test_slot_collisions.py
index a36e193d8..3837d638c 100644
--- a/pym/portage/tests/resolver/test_slot_collisions.py
+++ b/pym/portage/tests/resolver/test_slot_collisions.py
@@ -17,7 +17,9 @@ class SlotCollisionTestCase(TestCase):
"app-misc/Z-1": { },
"app-misc/Z-2": { },
"app-misc/Y-1": { "DEPEND": "=app-misc/Z-1" },
+ "app-misc/Y-2": { "DEPEND": ">app-misc/Z-1" },
"app-misc/X-1": { "DEPEND": "=app-misc/Z-2" },
+ "app-misc/X-2": { "DEPEND": "<app-misc/Z-2" },
"sci-libs/K-1": { "IUSE": "+foo", "EAPI": 1 },
"sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]", "EAPI": 2 },
@@ -42,14 +44,21 @@ class SlotCollisionTestCase(TestCase):
ignore_mergelist_order = True,
slot_collision_solutions = [ {"dev-libs/A-1": {"foo": True}, "dev-libs/D-1": {"foo": True}} ]),
- #A version based conflict, nothing we can do.
+ #A version based conflicts, nothing we can do.
ResolverPlaygroundTestCase(
- ["app-misc/X", "app-misc/Y"],
+ ["=app-misc/X-1", "=app-misc/Y-1"],
success = False,
mergelist = ["app-misc/Z-1", "app-misc/Z-2", "app-misc/X-1", "app-misc/Y-1"],
ignore_mergelist_order = True,
slot_collision_solutions = []
),
+ ResolverPlaygroundTestCase(
+ ["=app-misc/X-2", "=app-misc/Y-2"],
+ success = False,
+ mergelist = ["app-misc/Z-1", "app-misc/Z-2", "app-misc/X-2", "app-misc/Y-2"],
+ ignore_mergelist_order = True,
+ slot_collision_solutions = []
+ ),
#Simple cases.
ResolverPlaygroundTestCase(