From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1258138-garchives=archives.gentoo.org@lists.gentoo.org>
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 9A7231382C5
for <garchives@archives.gentoo.org>; Sat, 6 Mar 2021 09:53:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2FF8E0858;
Sat, 6 Mar 2021 09:53:20 +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 821A0E0858
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Mar 2021 09:53:20 +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 E3DD4340C98
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Mar 2021 09:53:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 06D4853
for <gentoo-commits@lists.gentoo.org>; Sat, 6 Mar 2021 09:53:17 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
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" <zmedico@gentoo.org>
Message-ID: <1615024372.a607bed25cb7d9cad7ef9533879b5ab93c94277c.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_unpack_dependencies.py lib/portage/tests/resolver/test_use_aliases.py
X-VCS-Directories: lib/portage/tests/resolver/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: a607bed25cb7d9cad7ef9533879b5ab93c94277c
X-VCS-Branch: master
Date: Sat, 6 Mar 2021 09:53:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7d573cfb-7045-478f-b21b-fc07267d4a33
X-Archives-Hash: 2e165d22f69623732a8700c441b8153d
commit: a607bed25cb7d9cad7ef9533879b5ab93c94277c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 09:51:33 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 09:52:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a607bed2
Remove unit tests for deprecated EAPI-progress
Fixes: 67cf9c2b0504 ("Mark EAPIs 4-python and 5-progress as deprecated")
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
.../tests/resolver/test_unpack_dependencies.py | 65 ----------
lib/portage/tests/resolver/test_use_aliases.py | 131 ---------------------
2 files changed, 196 deletions(-)
diff --git a/lib/portage/tests/resolver/test_unpack_dependencies.py b/lib/portage/tests/resolver/test_unpack_dependencies.py
deleted file mode 100644
index cfceff4b1..000000000
--- a/lib/portage/tests/resolver/test_unpack_dependencies.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from portage.tests import TestCase
-from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
-
-class UnpackDependenciesTestCase(TestCase):
- def testUnpackDependencies(self):
- distfiles = {
- "A-1.tar.gz": b"binary\0content",
- "B-1.TAR.XZ": b"binary\0content",
- "B-docs-1.tar.bz2": b"binary\0content",
- "C-1.TAR.XZ": b"binary\0content",
- "C-docs-1.tar.bz2": b"binary\0content",
- }
-
- ebuilds = {
- "dev-libs/A-1": {"SRC_URI": "A-1.tar.gz", "EAPI": "5-progress"},
- "dev-libs/B-1": {"IUSE": "doc", "SRC_URI": "B-1.TAR.XZ doc? ( B-docs-1.tar.bz2 )", "EAPI": "5-progress"},
- "dev-libs/C-1": {"IUSE": "doc", "SRC_URI": "C-1.TAR.XZ doc? ( C-docs-1.tar.bz2 )", "EAPI": "5-progress"},
- "app-arch/bzip2-1": {},
- "app-arch/gzip-1": {},
- "app-arch/tar-1": {},
- "app-arch/xz-utils-1": {},
- }
-
- repo_configs = {
- "test_repo": {
- "unpack_dependencies/5-progress": (
- "tar.bz2 app-arch/tar app-arch/bzip2",
- "tar.gz app-arch/tar app-arch/gzip",
- "tar.xz app-arch/tar app-arch/xz-utils",
- ),
- },
- }
-
- test_cases = (
- ResolverPlaygroundTestCase(
- ["dev-libs/A"],
- success = True,
- ignore_mergelist_order = True,
- mergelist = ["app-arch/tar-1", "app-arch/gzip-1", "dev-libs/A-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/B"],
- success = True,
- ignore_mergelist_order = True,
- mergelist = ["app-arch/tar-1", "app-arch/xz-utils-1", "dev-libs/B-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/C"],
- success = True,
- ignore_mergelist_order = True,
- mergelist = ["app-arch/tar-1", "app-arch/xz-utils-1", "app-arch/bzip2-1", "dev-libs/C-1"]),
- )
-
- user_config = {
- "package.use": ("dev-libs/C doc",)
- }
-
- playground = ResolverPlayground(distfiles=distfiles, ebuilds=ebuilds, repo_configs=repo_configs, user_config=user_config)
- try:
- for test_case in test_cases:
- playground.run_TestCase(test_case)
- self.assertEqual(test_case.test_success, True, test_case.fail_msg)
- finally:
- playground.cleanup()
diff --git a/lib/portage/tests/resolver/test_use_aliases.py b/lib/portage/tests/resolver/test_use_aliases.py
deleted file mode 100644
index 7c2debbb1..000000000
--- a/lib/portage/tests/resolver/test_use_aliases.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from portage.tests import TestCase
-from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase
-
-class UseAliasesTestCase(TestCase):
- def testUseAliases(self):
- ebuilds = {
- "dev-libs/A-1": {"DEPEND": "dev-libs/K[x]", "RDEPEND": "dev-libs/K[x]", "EAPI": "5"},
- "dev-libs/B-1": {"DEPEND": "dev-libs/L[x]", "RDEPEND": "dev-libs/L[x]", "EAPI": "5"},
- "dev-libs/C-1": {"DEPEND": "dev-libs/M[xx]", "RDEPEND": "dev-libs/M[xx]", "EAPI": "5"},
- "dev-libs/D-1": {"DEPEND": "dev-libs/N[-x]", "RDEPEND": "dev-libs/N[-x]", "EAPI": "5"},
- "dev-libs/E-1": {"DEPEND": "dev-libs/O[-xx]", "RDEPEND": "dev-libs/O[-xx]", "EAPI": "5"},
- "dev-libs/F-1": {"DEPEND": "dev-libs/P[-xx]", "RDEPEND": "dev-libs/P[-xx]", "EAPI": "5"},
- "dev-libs/G-1": {"DEPEND": "dev-libs/Q[x-y]", "RDEPEND": "dev-libs/Q[x-y]", "EAPI": "5"},
- "dev-libs/H-1": {"DEPEND": "=dev-libs/R-1*[yy]", "RDEPEND": "=dev-libs/R-1*[yy]", "EAPI": "5"},
- "dev-libs/H-2": {"DEPEND": "=dev-libs/R-2*[yy]", "RDEPEND": "=dev-libs/R-2*[yy]", "EAPI": "5"},
- "dev-libs/I-1": {"DEPEND": "dev-libs/S[y-z]", "RDEPEND": "dev-libs/S[y-z]", "EAPI": "5"},
- "dev-libs/I-2": {"DEPEND": "dev-libs/S[y_z]", "RDEPEND": "dev-libs/S[y_z]", "EAPI": "5"},
- "dev-libs/J-1": {"DEPEND": "dev-libs/T[x]", "RDEPEND": "dev-libs/T[x]", "EAPI": "5"},
- "dev-libs/K-1": {"IUSE": "+x", "EAPI": "5"},
- "dev-libs/K-2::repo1": {"IUSE": "+X", "EAPI": "5-progress"},
- "dev-libs/L-1": {"IUSE": "+x", "EAPI": "5"},
- "dev-libs/M-1::repo1": {"IUSE": "X", "EAPI": "5-progress"},
- "dev-libs/N-1": {"IUSE": "x", "EAPI": "5"},
- "dev-libs/N-2::repo1": {"IUSE": "X", "EAPI": "5-progress"},
- "dev-libs/O-1": {"IUSE": "x", "EAPI": "5"},
- "dev-libs/P-1::repo1": {"IUSE": "+X", "EAPI": "5-progress"},
- "dev-libs/Q-1::repo2": {"IUSE": "X.Y", "EAPI": "5-progress"},
- "dev-libs/R-1::repo1": {"IUSE": "Y", "EAPI": "5-progress"},
- "dev-libs/R-2::repo1": {"IUSE": "y", "EAPI": "5-progress"},
- "dev-libs/S-1::repo2": {"IUSE": "Y.Z", "EAPI": "5-progress"},
- "dev-libs/S-2::repo2": {"IUSE": "Y.Z", "EAPI": "5-progress"},
- "dev-libs/T-1::repo1": {"IUSE": "+X", "EAPI": "5"},
- }
-
- installed = {
- "dev-libs/L-2::repo1": {"IUSE": "+X", "USE": "X", "EAPI": "5-progress"},
- "dev-libs/O-2::repo1": {"IUSE": "X", "USE": "", "EAPI": "5-progress"},
- }
-
- repo_configs = {
- "repo1": {
- "use.aliases": ("X x xx",),
- "package.use.aliases": (
- "=dev-libs/R-1* Y yy",
- "=dev-libs/R-2* y yy",
- )
- },
- "repo2": {
- "eapi": ("5-progress",),
- "use.aliases": ("X.Y x-y",),
- "package.use.aliases": (
- "=dev-libs/S-1* Y.Z y-z",
- "=dev-libs/S-2* Y.Z y_z",
- ),
- },
- }
-
- test_cases = (
- ResolverPlaygroundTestCase(
- ["dev-libs/A"],
- success = True,
- mergelist = ["dev-libs/K-2", "dev-libs/A-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/B"],
- success = True,
- mergelist = ["dev-libs/B-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/C"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/M-1", "dev-libs/C-1"],
- use_changes = {"dev-libs/M-1": {"X": True}}),
- ResolverPlaygroundTestCase(
- ["dev-libs/D"],
- success = True,
- mergelist = ["dev-libs/N-2", "dev-libs/D-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/E"],
- success = True,
- mergelist = ["dev-libs/E-1"]),
- ResolverPlaygroundTestCase(
- ["dev-libs/F"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/P-1", "dev-libs/F-1"],
- use_changes = {"dev-libs/P-1": {"X": False}}),
- ResolverPlaygroundTestCase(
- ["dev-libs/G"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/Q-1", "dev-libs/G-1"],
- use_changes = {"dev-libs/Q-1": {"X.Y": True}}),
- ResolverPlaygroundTestCase(
- ["=dev-libs/H-1*"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/R-1", "dev-libs/H-1"],
- use_changes = {"dev-libs/R-1": {"Y": True}}),
- ResolverPlaygroundTestCase(
- ["=dev-libs/H-2*"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/R-2", "dev-libs/H-2"],
- use_changes = {"dev-libs/R-2": {"y": True}}),
- ResolverPlaygroundTestCase(
- ["=dev-libs/I-1*"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/S-1", "dev-libs/I-1"],
- use_changes = {"dev-libs/S-1": {"Y.Z": True}}),
- ResolverPlaygroundTestCase(
- ["=dev-libs/I-2*"],
- options = {"--autounmask": True},
- success = False,
- mergelist = ["dev-libs/S-2", "dev-libs/I-2"],
- use_changes = {"dev-libs/S-2": {"Y.Z": True}}),
- ResolverPlaygroundTestCase(
- ["dev-libs/J"],
- success = False),
- )
-
- playground = ResolverPlayground(ebuilds=ebuilds, installed=installed, repo_configs=repo_configs)
- try:
- for test_case in test_cases:
- playground.run_TestCase(test_case)
- self.assertEqual(test_case.test_success, True, test_case.fail_msg)
- finally:
- playground.cleanup()