| 1 |
commit: 7dc4131eca73aee2a78fd5c4339cb41760f7a54f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 25 07:55:24 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 25 08:09:22 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7dc4131e |
| 7 |
|
| 8 |
MergeOrderTestCase: update circ-buildtime mergelist for bug 690436 |
| 9 |
|
| 10 |
Update mergelist for the circ-buildtime test case so that it will pass |
| 11 |
after the fix for bug 690436, and also add a commented merge order |
| 12 |
assertion which will succeed after the fix. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/690436 |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
lib/portage/tests/resolver/test_merge_order.py | 9 +++++++-- |
| 18 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/lib/portage/tests/resolver/test_merge_order.py b/lib/portage/tests/resolver/test_merge_order.py |
| 21 |
index 5d000d12b..74e826661 100644 |
| 22 |
--- a/lib/portage/tests/resolver/test_merge_order.py |
| 23 |
+++ b/lib/portage/tests/resolver/test_merge_order.py |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 2011-2013 Gentoo Foundation |
| 26 |
+# Copyright 2011-2019 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
import portage |
| 30 |
@@ -319,7 +319,12 @@ class MergeOrderTestCase(TestCase): |
| 31 |
["app-misc/some-app-c", "app-misc/circ-buildtime-a"], |
| 32 |
success = True, |
| 33 |
ambiguous_merge_order = True, |
| 34 |
- mergelist = [("app-misc/circ-buildtime-b-1", "app-misc/circ-buildtime-c-1"), "app-misc/circ-buildtime-a-1", "app-misc/some-app-c-1"]), |
| 35 |
+ # The following merge order assertion reflects optimal order for |
| 36 |
+ # a circular relationship which is DEPEND in one direction and |
| 37 |
+ # RDEPEND in the other. The assertion currently fails, and the |
| 38 |
+ # patch for bug 690436 will fix it. |
| 39 |
+ #merge_order_assertions = (("app-misc/circ-buildtime-a-1", "app-misc/circ-buildtime-c-1"),), |
| 40 |
+ mergelist = [("app-misc/circ-buildtime-b-1", "app-misc/circ-buildtime-c-1", "app-misc/circ-buildtime-a-1"), "app-misc/some-app-c-1"]), |
| 41 |
# Test optimal merge order for a circular dep that is |
| 42 |
# RDEPEND in one direction and PDEPEND in the other. |
| 43 |
ResolverPlaygroundTestCase( |
Archives