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