From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Oct 2010 20:21:59 +0000 (-0700)
Subject: Enable tests for autoumask with EAPI 4.
X-Git-Tag: v2.2.0_alpha1~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b0c428d546dfce267b9d9744fa039e9f9d2972a;p=portage.git

Enable tests for autoumask with EAPI 4.
---

diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index 760c76487..d06b2fc30 100644
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -7,6 +7,9 @@ from portage.tests.resolver.ResolverPlayground import ResolverPlayground, Resolv
 class AutounmaskTestCase(TestCase):
 
 	def testAutounmask(self):
+
+		EAPI_4 = '4_pre1'
+
 		ebuilds = {
 			#ebuilds to test use changes
 			"dev-libs/A-1": { "SLOT": 1, "DEPEND": "dev-libs/B[foo]", "EAPI": 2}, 
@@ -42,10 +45,10 @@ class AutounmaskTestCase(TestCase):
 			"dev-util/R-1": { "IUSE": "bar" },
 
 			#ebuilds to test interaction with REQUIRED_USE
-			#~ "app-portage/A-1": { "DEPEND": "app-portage/B[foo]", "EAPI": 2 }, 
-			#~ "app-portage/A-2": { "DEPEND": "app-portage/B[foo=]", "IUSE": "+foo", "REQUIRED_USE": "foo", "EAPI": 4 }, 
-#~ 
-			#~ "app-portage/B-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": 4 }, 
+			"app-portage/A-1": { "DEPEND": "app-portage/B[foo]", "EAPI": 2 }, 
+			"app-portage/A-2": { "DEPEND": "app-portage/B[foo=]", "IUSE": "+foo", "REQUIRED_USE": "foo", "EAPI": EAPI_4 }, 
+
+			"app-portage/B-1": { "IUSE": "foo +bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 }, 
 			}
 
 		test_cases = (
@@ -168,16 +171,16 @@ class AutounmaskTestCase(TestCase):
 					use_changes = { "dev-util/R-1": { "bar": True } }),
 
 				#Test interaction with REQUIRED_USE.
-				#~ ResolverPlaygroundTestCase(
-					#~ ["=app-portage/A-1"],
-					#~ options = { "--autounmask": True },
-					#~ use_changes = None,
-					#~ success = False),
-				#~ ResolverPlaygroundTestCase(
-					#~ ["=app-portage/A-2"],
-					#~ options = { "--autounmask": True },
-					#~ use_changes = None,
-					#~ success = False),
+				ResolverPlaygroundTestCase(
+					["=app-portage/A-1"],
+					options = { "--autounmask": True },
+					use_changes = None,
+					success = False),
+				ResolverPlaygroundTestCase(
+					["=app-portage/A-2"],
+					options = { "--autounmask": True },
+					use_changes = None,
+					success = False),
 			)
 
 		playground = ResolverPlayground(ebuilds=ebuilds)