Enable tests for slot collision with REQUIRED_USE

diff --git a/pym/portage/tests/resolver/test_slot_collisions.py b/pym/portage/tests/resolver/test_slot_collisions.py
index 9933979a39201ff3863c854dd809d37481d480cd..7d51f9847d03aaa952d27f40c8a305dfc90a9769 100644 (file)
--- a/pym/portage/tests/resolver/test_slot_collisions.py
+++ b/pym/portage/tests/resolver/test_slot_collisions.py
@@ -8,6 +8,8 @@ class SlotCollisionTestCase(TestCase):
 
        def testSlotCollision(self):
 
+               EAPI_4 = '4_pre1'
+
                ebuilds = {
                        "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" }, 
                        "dev-libs/B-1": { "IUSE": "foo" },
@@ -25,9 +27,9 @@ class SlotCollisionTestCase(TestCase):
                        "sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]", "EAPI": 2 },
                        "sci-libs/M-1": { "DEPEND": "sci-libs/K[foo=]", "IUSE": "+foo", "EAPI": 2 },
 
-                       #~ "app-misc/A-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": 4 },
-                       #~ "app-misc/B-1": { "DEPEND": "=app-misc/A-1[foo=]", "IUSE": "foo", "EAPI": 2 },
-                       #~ "app-misc/C-1": { "DEPEND": "=app-misc/A-1[foo]", "EAPI": 2 },
+                       "app-misc/A-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
+                       "app-misc/B-1": { "DEPEND": "=app-misc/A-1[foo=]", "IUSE": "foo", "EAPI": 2 },
+                       "app-misc/C-1": { "DEPEND": "=app-misc/A-1[foo]", "EAPI": 2 },
                        }
                installed = {
                        "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" }, 
@@ -38,7 +40,7 @@ class SlotCollisionTestCase(TestCase):
                        "sci-libs/K-1": { "IUSE": "foo", "USE": "" },
                        "sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]" },
 
-                       #~ "app-misc/A-1": { "IUSE": "+foo bar", "USE": "foo", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": 4 },
+                       "app-misc/A-1": { "IUSE": "+foo bar", "USE": "foo", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 },
                        }
 
                test_cases = (
@@ -76,13 +78,13 @@ class SlotCollisionTestCase(TestCase):
                                ),
 
                        #Conflict with REQUIRED_USE
-                       #~ ResolverPlaygroundTestCase(
-                               #~ ["=app-misc/C-1", "=app-misc/B-1"],
-                               #~ all_permutations = True,
-                               #~ slot_collision_solutions = [],
-                               #~ mergelist = ["app-misc/A-1", "app-misc/C-1", "app-misc/B-1"],
-                               #~ ignore_mergelist_order = True,
-                               #~ success = False),
+                       ResolverPlaygroundTestCase(
+                               ["=app-misc/C-1", "=app-misc/B-1"],
+                               all_permutations = True,
+                               slot_collision_solutions = [],
+                               mergelist = ["app-misc/A-1", "app-misc/C-1", "app-misc/B-1"],
+                               ignore_mergelist_order = True,
+                               success = False),
                        )
 
                playground = ResolverPlayground(ebuilds=ebuilds, installed=installed)