Tests: More slot_collision_handler tests
authorSebastian Luther <SebastianLuther@gmx.de>
Wed, 11 Aug 2010 11:24:48 +0000 (13:24 +0200)
committerZac Medico <zmedico@gentoo.org>
Thu, 12 Aug 2010 08:17:25 +0000 (01:17 -0700)
pym/portage/tests/resolver/test_slot_collisions.py

index a36e193d824a32a98aba8cd5a5709bfef9c6e676..3837d638c7a9b45f51a1a0816bc4cc4ce99b4b6c 100644 (file)
@@ -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(