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, 26 Jan 2020 00:20:35
Message-Id: 1579997984.e2a2adf4b2ff7291fd12dce43c1d4c542c399a9f.zmedico@gentoo
1 commit: e2a2adf4b2ff7291fd12dce43c1d4c542c399a9f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 26 00:18:48 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 26 00:19:44 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2a2adf4
7
8 MultirepoTestCase: package.keywords -> package.accept_keywords
9
10 Bug: https://bugs.gentoo.org/607852
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 lib/portage/tests/resolver/test_multirepo.py | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/lib/portage/tests/resolver/test_multirepo.py b/lib/portage/tests/resolver/test_multirepo.py
17 index dabec6af9..bdfcf2120 100644
18 --- a/lib/portage/tests/resolver/test_multirepo.py
19 +++ b/lib/portage/tests/resolver/test_multirepo.py
20 @@ -1,4 +1,4 @@
21 -# Copyright 2010-2014 Gentoo Foundation
22 +# Copyright 2010-2020 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 from portage.tests import TestCase
26 @@ -246,7 +246,7 @@ class MultirepoTestCase(TestCase):
27 "dev-libs/B-2": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 },
28 "dev-libs/B-3": { "DEPEND": "dev-libs/A[-foo]", "EAPI": 2 },
29
30 - #package.keywords test
31 + #package.accept_keywords test
32 "dev-libs/C-1": { "KEYWORDS": "~x86" },
33 "dev-libs/C-1::repo1": { "KEYWORDS": "~x86" },
34
35 @@ -286,7 +286,7 @@ class MultirepoTestCase(TestCase):
36 (
37 "dev-libs/A::repo1 foo",
38 ),
39 - "package.keywords":
40 + "package.accept_keywords":
41 (
42 "=dev-libs/C-1::test_repo",
43 ),
44 @@ -332,7 +332,7 @@ class MultirepoTestCase(TestCase):
45 success = False,
46 check_repo_names = True),
47
48 - #package.keywords test
49 + #package.accept_keywords test
50 ResolverPlaygroundTestCase(
51 ["dev-libs/C"],
52 success = True,