From 2fe14319d9143610dfdb8d1d044d7432038c857c Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 29 Jul 2013 19:08:26 -0700
Subject: [PATCH] Add test for bug #478188.

---
 pym/portage/tests/resolver/test_or_choices.py | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pym/portage/tests/resolver/test_or_choices.py

diff --git a/pym/portage/tests/resolver/test_or_choices.py b/pym/portage/tests/resolver/test_or_choices.py
new file mode 100644
index 000000000..3bc67bca2
--- /dev/null
+++ b/pym/portage/tests/resolver/test_or_choices.py
@@ -0,0 +1,65 @@
+# Copyright 2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+from portage.tests import TestCase
+from portage.tests.resolver.ResolverPlayground import (ResolverPlayground,
+	ResolverPlaygroundTestCase)
+
+class OrChoicesTestCase(TestCase):
+
+	def testOrChoices(self):
+		ebuilds = {
+			"dev-lang/vala-0.20.0" : {
+				"EAPI": "5",
+				"SLOT": "0.20"
+			},
+			"dev-lang/vala-0.18.0" : {
+				"EAPI": "5",
+				"SLOT": "0.18"
+			},
+			#"dev-libs/gobject-introspection-1.36.0" : {
+			#	"EAPI": "5",
+			#	"RDEPEND" : "!<dev-lang/vala-0.20.0",
+			#},
+			"dev-libs/gobject-introspection-1.34.0" : {
+				"EAPI": "5"
+			},
+			"sys-apps/systemd-ui-2" : {
+				"EAPI": "5",
+				"RDEPEND" : "|| ( dev-lang/vala:0.20 dev-lang/vala:0.18 )"
+			},
+		}
+
+		installed = {
+			"dev-lang/vala-0.18.0" : {
+				"EAPI": "5",
+				"SLOT": "0.18"
+			},
+			"dev-libs/gobject-introspection-1.34.0" : {
+				"EAPI": "5"
+			},
+			"sys-apps/systemd-ui-2" : {
+				"EAPI": "5",
+				"RDEPEND" : "|| ( dev-lang/vala:0.20 dev-lang/vala:0.18 )"
+			},
+		}
+
+		world = ["dev-libs/gobject-introspection", "sys-apps/systemd-ui"]
+
+		test_cases = (
+			# Demonstrate that vala:0.20 update is not pulled in, as in bug #478188
+			ResolverPlaygroundTestCase(
+				["@world"],
+				options = {"--update": True, "--deep": True},
+				success=True,
+				all_permutations = True,
+				mergelist = []),
+		)
+
+		playground = ResolverPlayground(ebuilds=ebuilds, installed=installed, world=world)
+		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()
-- 
2.26.2