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 E7EEA138350 for ; Sun, 26 Jan 2020 00:20:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A12E0875; Sun, 26 Jan 2020 00:20:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 8C9E4E0875 for ; Sun, 26 Jan 2020 00:20:34 +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 750A034E30D for ; Sun, 26 Jan 2020 00:20:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F330A3E for ; Sun, 26 Jan 2020 00:20:31 +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: <1579997984.e2a2adf4b2ff7291fd12dce43c1d4c542c399a9f.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_multirepo.py X-VCS-Directories: lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e2a2adf4b2ff7291fd12dce43c1d4c542c399a9f X-VCS-Branch: master Date: Sun, 26 Jan 2020 00:20:31 +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: 14bf686b-c40a-4004-84d7-4dfe408ba3c2 X-Archives-Hash: 58b50c5e365d403836e1a21427411e40 commit: e2a2adf4b2ff7291fd12dce43c1d4c542c399a9f Author: Zac Medico gentoo org> AuthorDate: Sun Jan 26 00:18:48 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jan 26 00:19:44 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2a2adf4 MultirepoTestCase: package.keywords -> package.accept_keywords Bug: https://bugs.gentoo.org/607852 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_multirepo.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/portage/tests/resolver/test_multirepo.py b/lib/portage/tests/resolver/test_multirepo.py index dabec6af9..bdfcf2120 100644 --- a/lib/portage/tests/resolver/test_multirepo.py +++ b/lib/portage/tests/resolver/test_multirepo.py @@ -1,4 +1,4 @@ -# Copyright 2010-2014 Gentoo Foundation +# Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -246,7 +246,7 @@ class MultirepoTestCase(TestCase): "dev-libs/B-2": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 }, "dev-libs/B-3": { "DEPEND": "dev-libs/A[-foo]", "EAPI": 2 }, - #package.keywords test + #package.accept_keywords test "dev-libs/C-1": { "KEYWORDS": "~x86" }, "dev-libs/C-1::repo1": { "KEYWORDS": "~x86" }, @@ -286,7 +286,7 @@ class MultirepoTestCase(TestCase): ( "dev-libs/A::repo1 foo", ), - "package.keywords": + "package.accept_keywords": ( "=dev-libs/C-1::test_repo", ), @@ -332,7 +332,7 @@ class MultirepoTestCase(TestCase): success = False, check_repo_names = True), - #package.keywords test + #package.accept_keywords test ResolverPlaygroundTestCase( ["dev-libs/C"], success = True,