Add test for bug #478188.

diff --git a/pym/portage/tests/resolver/test_or_choices.py b/pym/portage/tests/resolver/test_or_choices.py
new file mode 100644 (file)
index 0000000..3bc67bc
--- /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()