From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F901138334 for ; Sun, 15 Sep 2019 03:37:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 807DBE085A; Sun, 15 Sep 2019 03:37:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3334E085A for ; Sun, 15 Sep 2019 03:37:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79E4734B1A7 for ; Sun, 15 Sep 2019 03:36:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C21074D3 for ; Sun, 15 Sep 2019 03:36:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1568518548.c510f715b748a604c47fb78ed4796bf0391bcfdd.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py X-VCS-Directories: lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c510f715b748a604c47fb78ed4796bf0391bcfdd X-VCS-Branch: master Date: Sun, 15 Sep 2019 03:36:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1d9cae1-35f9-4dce-b08d-69eab58e3c1e X-Archives-Hash: e7555cc6c655324013f545480e87a609 commit: c510f715b748a604c47fb78ed4796bf0391bcfdd Author: Zac Medico gentoo org> AuthorDate: Sun Sep 15 03:34:07 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Sep 15 03:35:48 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c510f715 SlotOperatorRuntimePkgMaskTestCase: increase --backtrack to 13 Hopefully this solves an occasional travis-ci test failure like this: AssertionError: False != True : atoms: (=app-misc/meta-pkg-2), key: slot_collision_solutions, expected: None, got: [] atoms: (=app-misc/meta-pkg-2), key: success, expected: True, got: False See: https://travis-ci.org/gentoo/portage/jobs/585109030 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index f8b53e2b5..4a028def3 100644 --- a/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py +++ b/lib/portage/tests/resolver/test_slot_operator_runtime_pkg_mask.py @@ -1,4 +1,4 @@ -# Copyright 2017 Gentoo Foundation +# Copyright 2017-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -110,7 +110,7 @@ class SlotOperatorRuntimePkgMaskTestCase(TestCase): ResolverPlaygroundTestCase( ["=app-misc/meta-pkg-2"], options = { - "--backtrack": 12, + "--backtrack": 13, }, success = True, ambiguous_merge_order = True,