Enable tests for use dep defaults.

diff --git a/pym/portage/tests/resolver/test_use_dep_defaults.py b/pym/portage/tests/resolver/test_use_dep_defaults.py
index 0ddcd38368fc1f2568df68ff00d524e6e5899bbe..bc7bc25cc3e54ac57ba05bd52a312fea518c6e41 100644 (file)
--- a/pym/portage/tests/resolver/test_use_dep_defaults.py
+++ b/pym/portage/tests/resolver/test_use_dep_defaults.py
@@ -2,39 +2,41 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase
-#from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
+from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
 
 class UseDepDefaultsTestCase(TestCase):
 
        def testUseDepDefaultse(self):
-               pass
-               #~ ebuilds = {
-                       #~ "dev-libs/A-1": { "DEPEND": "dev-libs/B[foo]", "RDEPEND": "dev-libs/B[foo]", "EAPI": 2 },
-                       #~ "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": 4 },
-                       #~ "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": 4 },
-                       #~ "dev-libs/B-1": { "IUSE": "+foo", "EAPI": 1 },
-                       #~ "dev-libs/B-2": {},
-                       #~ }
-#~ 
-               #~ test_cases = (
-                       #~ ResolverPlaygroundTestCase(
-                               #~ ["=dev-libs/A-1"],
-                               #~ success = True,
-                               #~ mergelist = ["dev-libs/B-1", "dev-libs/A-1"]),
-                       #~ ResolverPlaygroundTestCase(
-                               #~ ["=dev-libs/A-2"],
-                               #~ success = True,
-                               #~ mergelist = ["dev-libs/B-2", "dev-libs/A-2"]),
-                       #~ ResolverPlaygroundTestCase(
-                               #~ ["=dev-libs/A-3"],
-                               #~ success = True,
-                               #~ mergelist = ["dev-libs/B-1", "dev-libs/A-3"]),
-                       #~ )
-#~ 
-               #~ playground = ResolverPlayground(ebuilds=ebuilds)
-               #~ try:
-                       #~ for test_case in test_cases:
-                               #~ playground.run_TestCase(test_case)
-                               #~ self.assertEqual(test_case.test_success, True, test_case.fail_msg)
-               #~ finally:
-                       #~ playground.cleanup()
+
+               EAPI_4 = '4_pre1'
+
+               ebuilds = {
+                       "dev-libs/A-1": { "DEPEND": "dev-libs/B[foo]", "RDEPEND": "dev-libs/B[foo]", "EAPI": "2" },
+                       "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": EAPI_4 },
+                       "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": EAPI_4 },
+                       "dev-libs/B-1": { "IUSE": "+foo", "EAPI": "1" },
+                       "dev-libs/B-2": {},
+                       }
+
+               test_cases = (
+                       ResolverPlaygroundTestCase(
+                               ["=dev-libs/A-1"],
+                               success = True,
+                               mergelist = ["dev-libs/B-1", "dev-libs/A-1"]),
+                       ResolverPlaygroundTestCase(
+                               ["=dev-libs/A-2"],
+                               success = True,
+                               mergelist = ["dev-libs/B-2", "dev-libs/A-2"]),
+                       ResolverPlaygroundTestCase(
+                               ["=dev-libs/A-3"],
+                               success = True,
+                               mergelist = ["dev-libs/B-1", "dev-libs/A-3"]),
+                       )
+
+               playground = ResolverPlayground(ebuilds=ebuilds)
+               try:
+                       for test_case in test_cases:
+                               playground.run_TestCase(test_case)
+                               self.assertEqual(test_case.test_success, True, test_case.fail_msg)
+               finally:
+                       playground.cleanup()