test_merge_order: make cycles indirect

diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index 45890af23e4f07b949e25aa09a1e57100090b5a8..5ec569a243603f9215e50b118f2b69d6a9e4a470 100644 (file)
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -23,12 +23,18 @@ class MergeOrderTestCase(TestCase):
                                "PDEPEND": "app-misc/circ-post-runtime-b",
                        },
                        "app-misc/circ-post-runtime-b-1": {
+                               "RDEPEND": "app-misc/circ-post-runtime-c",
+                       },
+                       "app-misc/circ-post-runtime-c-1": {
                                "RDEPEND": "app-misc/circ-post-runtime-a",
                        },
                        "app-misc/circ-runtime-a-1": {
                                "RDEPEND": "app-misc/circ-runtime-b",
                        },
                        "app-misc/circ-runtime-b-1": {
+                               "RDEPEND": "app-misc/circ-runtime-c",
+                       },
+                       "app-misc/circ-runtime-c-1": {
                                "RDEPEND": "app-misc/circ-runtime-a",
                        },
                        "app-misc/installed-blocker-a-1" : {
@@ -57,18 +63,19 @@ class MergeOrderTestCase(TestCase):
                                ["app-misc/some-app-a"],
                                success = True,
                                ambigous_merge_order = True,
-                               mergelist = [("app-misc/circ-runtime-a-1", "app-misc/circ-runtime-b-1"), "app-misc/some-app-a-1"]),
+                               mergelist = [("app-misc/circ-runtime-a-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-c-1"), "app-misc/some-app-a-1"]),
                        ResolverPlaygroundTestCase(
                                ["app-misc/some-app-a"],
                                success = True,
                                ambigous_merge_order = True,
-                               mergelist = [("app-misc/circ-runtime-b-1", "app-misc/circ-runtime-a-1"), "app-misc/some-app-a-1"]),
+                               mergelist = [("app-misc/circ-runtime-c-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-a-1"), "app-misc/some-app-a-1"]),
                        # Test optimal merge order for a circular dep that is
                        # RDEPEND in one direction and PDEPEND in the other.
                        ResolverPlaygroundTestCase(
                                ["app-misc/some-app-b"],
                                success = True,
-                               mergelist = ["app-misc/circ-post-runtime-a-1", "app-misc/circ-post-runtime-b-1", "app-misc/some-app-b-1"]),
+                               ambigous_merge_order = True,
+                               mergelist = ["app-misc/circ-post-runtime-a-1", ("app-misc/circ-post-runtime-b-1", "app-misc/circ-post-runtime-c-1"), "app-misc/some-app-b-1"]),
                        # installed package has buildtime-only blocker
                        # that should be ignored
                        ResolverPlaygroundTestCase(