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 A23AE138334 for ; Mon, 21 Oct 2019 08:26:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8D96E0C02; Mon, 21 Oct 2019 08:26:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 BC2A6E0C02 for ; Mon, 21 Oct 2019 08:26:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C6B2034C04F for ; Mon, 21 Oct 2019 08:26:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 074B87F8 for ; Mon, 21 Oct 2019 08:26:28 +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: <1571646207.72c3a6d7179d9b18b8681a958a86af95889e6d88.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: 72c3a6d7179d9b18b8681a958a86af95889e6d88 X-VCS-Branch: master Date: Mon, 21 Oct 2019 08:26:28 +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: 3ca1b669-7806-4e5c-a377-980b57c6098c X-Archives-Hash: 0bed81a7d00af895f92d7a69559cdcf2 commit: 72c3a6d7179d9b18b8681a958a86af95889e6d88 Author: Zac Medico gentoo org> AuthorDate: Mon Oct 21 08:20:45 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 21 08:23:27 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=72c3a6d7 SlotOperatorRuntimePkgMaskTestCase: increase --backtrack to 14 Hopefully this solves an occasional travis-ci test failure, since the increase to 13 in c510f715b748 did not solve it. Curiously, both observed failures were with python3.5. See: https://travis-ci.org/gentoo/portage/jobs/600277643 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a028def3..affe33f89 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 @@ -110,7 +110,7 @@ class SlotOperatorRuntimePkgMaskTestCase(TestCase): ResolverPlaygroundTestCase( ["=app-misc/meta-pkg-2"], options = { - "--backtrack": 13, + "--backtrack": 14, }, success = True, ambiguous_merge_order = True,