From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Wed, 11 Aug 2010 11:24:48 +0000 (+0200)
Subject: Tests: More slot_collision_handler tests
X-Git-Tag: v2.2_rc68~273
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5bab900f63e98495e7048e972ff3ae4ec53778a7;p=portage.git

Tests: More slot_collision_handler tests
---

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(