aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-12-24 23:55:24 -0800
committerZac Medico <zmedico@gentoo.org>2019-12-25 00:09:22 -0800
commit7dc4131eca73aee2a78fd5c4339cb41760f7a54f (patch)
tree2d7e9ee3b002071c24ae508f1b16fafabba7729c /lib/portage/tests/resolver/test_merge_order.py
parentUpdates for portage-2.3.83 release (diff)
downloadportage-7dc4131eca73aee2a78fd5c4339cb41760f7a54f.tar.gz
portage-7dc4131eca73aee2a78fd5c4339cb41760f7a54f.tar.bz2
portage-7dc4131eca73aee2a78fd5c4339cb41760f7a54f.zip
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@gentoo.org>
Diffstat (limited to 'lib/portage/tests/resolver/test_merge_order.py')
-rw-r--r--lib/portage/tests/resolver/test_merge_order.py9
1 files 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(