summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-21 01:47:13 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-21 01:47:13 -0700
commit7d43393760af0bce280214c1350c06dd4c586f69 (patch)
treef769aba9e914f17b9b793f1ab89900e176586225
parentaefaa5910129b31ec33e2dc02654e79e0611c351 (diff)
downloadportage-7d43393760af0bce280214c1350c06dd4c586f69.tar.gz
portage-7d43393760af0bce280214c1350c06dd4c586f69.tar.bz2
portage-7d43393760af0bce280214c1350c06dd4c586f69.zip
test_merge_order: make cycles indirect
-rw-r--r--pym/portage/tests/resolver/test_merge_order.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index 45890af23..5ec569a24 100644
--- 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(