From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Jun 2012 00:23:54 +0000 (-0700)
Subject: test_autounmask: add case for bug #420847
X-Git-Tag: v2.2.0_alpha111~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1a7dc427d000f5b5e85d5dc5cfa449346bdd7d4;p=portage.git

test_autounmask: add case for bug #420847
---

diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index 46dbab18e..c75a17401 100644
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -285,6 +285,9 @@ class AutounmaskTestCase(TestCase):
 			"dev-libs/E-1": { "LICENSE": "TEST" },
 			"dev-libs/E-2": { "LICENSE": "TEST" },
 			"dev-libs/F-1": { "DEPEND": "=dev-libs/E-1", "LICENSE": "TEST" },
+
+			"dev-java/sun-jdk-1.6.0.32": { "LICENSE": "TEST", "KEYWORDS": "~x86" },
+			"dev-java/sun-jdk-1.6.0.31": { "LICENSE": "TEST", "KEYWORDS": "x86" },
 			}
 
 		test_cases = (
@@ -316,6 +319,14 @@ class AutounmaskTestCase(TestCase):
 					success = False,
 					mergelist = ["dev-libs/E-1", "dev-libs/F-1", "dev-libs/D-1"],
 					license_changes = { "dev-libs/D-1": set(["TEST"]), "dev-libs/E-1": set(["TEST"]), "dev-libs/E-2": set(["TEST"]), "dev-libs/F-1": set(["TEST"]) }),
+
+				#Test license only for bug #420847
+				#ResolverPlaygroundTestCase(
+					#["dev-java/sun-jdk"],
+					#options = {"--autounmask": True},
+					#success = False,
+					#mergelist = ["dev-java/sun-jdk-1.6.0.31"],
+					#license_changes = { "dev-java/sun-jdk-1.6.0.31": set(["TEST"]) }),
 			)
 
 		playground = ResolverPlayground(ebuilds=ebuilds)