Enable more tests for resolver with EAPI 4.

diff --git a/pym/portage/tests/resolver/test_eapi.py b/pym/portage/tests/resolver/test_eapi.py
index 88acad4c372656266155b4cb9c9f09957661de61..4d67c2bf4aff7fc3b4290ce1a13c5c32eef7d693 100644 (file)
--- a/pym/portage/tests/resolver/test_eapi.py
+++ b/pym/portage/tests/resolver/test_eapi.py
@@ -68,43 +68,43 @@ class EAPITestCase(TestCase):
                        ResolverPlaygroundTestCase(["=dev-libs/A-1.1"], success = True, mergelist = ["dev-libs/A-1.1"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-1.2"], success = True, mergelist = ["dev-libs/A-1.2"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-1.3"], success = True, mergelist = ["dev-libs/A-1.3"]),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-1.4"], success = True, mergelist = ["dev-libs/A-1.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-1.4"], success = True, mergelist = ["dev-libs/A-1.4"]),
 
                        ResolverPlaygroundTestCase(["=dev-libs/A-2.0"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-2.1"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-2.1"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-2.2"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-2.2"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-2.3"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-2.3"]),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-2.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-2.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-2.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-2.4"]),
 
                        ResolverPlaygroundTestCase(["=dev-libs/A-3.0"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-3.1"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-3.2"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-3.2"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-3.3"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-3.3"]),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-3.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-3.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-3.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-3.4"]),
 
                        ResolverPlaygroundTestCase(["=dev-libs/A-4.0"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-4.1"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-4.2"], success = True, mergelist = ["dev-libs/A-4.2"]),
                        ResolverPlaygroundTestCase(["=dev-libs/A-4.3"], success = True, mergelist = ["dev-libs/A-4.3"]),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-4.4"], success = True, mergelist = ["dev-libs/A-4.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-4.4"], success = True, mergelist = ["dev-libs/A-4.4"]),
 
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-5.0"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-5.1"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-5.2"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-5.3"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-5.0"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-5.1"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-5.2"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-5.3"], success = False),
                        #~ ResolverPlaygroundTestCase(["=dev-libs/A-5.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-5.4"]),
 
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-6.0"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-6.1"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-6.2"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-6.3"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-6.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-6.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-6.0"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-6.1"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-6.2"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-6.3"], success = False),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-6.4"], success = True, mergelist = ["dev-libs/B-1", "dev-libs/A-6.4"]),
                        
                        ResolverPlaygroundTestCase(["=dev-libs/A-7.0"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-7.1"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-7.2"], success = False),
                        ResolverPlaygroundTestCase(["=dev-libs/A-7.3"], success = False),
-                       #~ ResolverPlaygroundTestCase(["=dev-libs/A-7.4"], success = True, mergelist = ["dev-libs/A-7.4"]),
+                       ResolverPlaygroundTestCase(["=dev-libs/A-7.4"], success = True, mergelist = ["dev-libs/A-7.4"]),
                )
 
                playground = ResolverPlayground(ebuilds=ebuilds)