| 1 |
commit: 7d43393760af0bce280214c1350c06dd4c586f69 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 21 08:47:13 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 21 08:47:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7d433937 |
| 7 |
|
| 8 |
test_merge_order: make cycles indirect |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/resolver/test_merge_order.py | 13 ++++++++++--- |
| 12 |
1 files changed, 10 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py |
| 15 |
index 45890af..5ec569a 100644 |
| 16 |
--- a/pym/portage/tests/resolver/test_merge_order.py |
| 17 |
+++ b/pym/portage/tests/resolver/test_merge_order.py |
| 18 |
@@ -23,12 +23,18 @@ class MergeOrderTestCase(TestCase): |
| 19 |
"PDEPEND": "app-misc/circ-post-runtime-b", |
| 20 |
}, |
| 21 |
"app-misc/circ-post-runtime-b-1": { |
| 22 |
+ "RDEPEND": "app-misc/circ-post-runtime-c", |
| 23 |
+ }, |
| 24 |
+ "app-misc/circ-post-runtime-c-1": { |
| 25 |
"RDEPEND": "app-misc/circ-post-runtime-a", |
| 26 |
}, |
| 27 |
"app-misc/circ-runtime-a-1": { |
| 28 |
"RDEPEND": "app-misc/circ-runtime-b", |
| 29 |
}, |
| 30 |
"app-misc/circ-runtime-b-1": { |
| 31 |
+ "RDEPEND": "app-misc/circ-runtime-c", |
| 32 |
+ }, |
| 33 |
+ "app-misc/circ-runtime-c-1": { |
| 34 |
"RDEPEND": "app-misc/circ-runtime-a", |
| 35 |
}, |
| 36 |
"app-misc/installed-blocker-a-1" : { |
| 37 |
@@ -57,18 +63,19 @@ class MergeOrderTestCase(TestCase): |
| 38 |
["app-misc/some-app-a"], |
| 39 |
success = True, |
| 40 |
ambigous_merge_order = True, |
| 41 |
- mergelist = [("app-misc/circ-runtime-a-1", "app-misc/circ-runtime-b-1"), "app-misc/some-app-a-1"]), |
| 42 |
+ 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"]), |
| 43 |
ResolverPlaygroundTestCase( |
| 44 |
["app-misc/some-app-a"], |
| 45 |
success = True, |
| 46 |
ambigous_merge_order = True, |
| 47 |
- mergelist = [("app-misc/circ-runtime-b-1", "app-misc/circ-runtime-a-1"), "app-misc/some-app-a-1"]), |
| 48 |
+ 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"]), |
| 49 |
# Test optimal merge order for a circular dep that is |
| 50 |
# RDEPEND in one direction and PDEPEND in the other. |
| 51 |
ResolverPlaygroundTestCase( |
| 52 |
["app-misc/some-app-b"], |
| 53 |
success = True, |
| 54 |
- mergelist = ["app-misc/circ-post-runtime-a-1", "app-misc/circ-post-runtime-b-1", "app-misc/some-app-b-1"]), |
| 55 |
+ ambigous_merge_order = True, |
| 56 |
+ 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"]), |
| 57 |
# installed package has buildtime-only blocker |
| 58 |
# that should be ignored |
| 59 |
ResolverPlaygroundTestCase( |
Archives