Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
Date: Sun, 15 Sep 2019 03:37:03
Message-Id: 1568518548.c510f715b748a604c47fb78ed4796bf0391bcfdd.zmedico@gentoo
1 commit: c510f715b748a604c47fb78ed4796bf0391bcfdd
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 15 03:34:07 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 15 03:35:48 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c510f715
7
8 SlotOperatorRuntimePkgMaskTestCase: increase --backtrack to 13
9
10 Hopefully this solves an occasional travis-ci test failure like this:
11
12 AssertionError: False != True : atoms: (=app-misc/meta-pkg-2), key: slot_collision_solutions, expected: None, got: []
13 atoms: (=app-misc/meta-pkg-2), key: success, expected: True, got: False
14
15 See: https://travis-ci.org/gentoo/portage/jobs/585109030
16 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
17
18 lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
20
21 diff --git a/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
22 index f8b53e2b5..4a028def3 100644
23 --- a/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
24 +++ b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py
25 @@ -1,4 +1,4 @@
26 -# Copyright 2017 Gentoo Foundation
27 +# Copyright 2017-2019 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 from portage.tests import TestCase
31 @@ -110,7 +110,7 @@ class SlotOperatorRuntimePkgMaskTestCase(TestCase):
32 ResolverPlaygroundTestCase(
33 ["=app-misc/meta-pkg-2"],
34 options = {
35 - "--backtrack": 12,
36 + "--backtrack": 13,
37 },
38 success = True,
39 ambiguous_merge_order = True,