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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 00487158020 for ; Fri, 11 Nov 2022 17:33:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47A04E09BF; Fri, 11 Nov 2022 17:33:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09A83E09BF for ; Fri, 11 Nov 2022 17:33:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E899B340F70 for ; Fri, 11 Nov 2022 17:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BBD072B for ; Fri, 11 Nov 2022 17:33:53 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1668188022.ad80bcbb0fb4b7ddca33a27f7f450fd6baa2cf54.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/, sys-apps/pkgcore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild X-VCS-Directories: sys-apps/pkgcore/ sys-apps/pkgcore/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: ad80bcbb0fb4b7ddca33a27f7f450fd6baa2cf54 X-VCS-Branch: master Date: Fri, 11 Nov 2022 17:33:53 +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: 56ac0f75-06d3-4c7b-84a7-aa374ba5c2b3 X-Archives-Hash: bfdb21d0a8d92ed383b70372cb7456b3 commit: ad80bcbb0fb4b7ddca33a27f7f450fd6baa2cf54 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Nov 11 17:33:06 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Nov 11 17:33:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad80bcbb sys-apps/pkgcore: fix test artifacts being installed Closes: https://bugs.gentoo.org/880881 Signed-off-by: Arthur Zamarin gentoo.org> .../files/pkgcore-0.12.17-fix-extra-files.patch | 29 ++++++++++++++++++++++ ...0.12.17-r1.ebuild => pkgcore-0.12.17-r2.ebuild} | 1 + 2 files changed, 30 insertions(+) diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch new file mode 100644 index 000000000000..bc6b16ffc69f --- /dev/null +++ b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch @@ -0,0 +1,29 @@ +--- a/tests/ebuild/test_eapi.py ++++ b/tests/ebuild/test_eapi.py +@@ -1,6 +1,8 @@ ++import shutil + from unittest import mock + + import pytest ++from pkgcore.const import EBD_PATH + from pkgcore.ebuild import eapi + from pkgcore.ebuild.eapi import EAPI, eapi6, get_eapi + +@@ -19,13 +21,15 @@ def test_get_eapi(): + + class TestEAPI: + +- def test_register(self): ++ def test_register(self, tmp_path): + # re-register known EAPI + with pytest.raises(ValueError): + EAPI.register(magic="0") + ++ mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / 'ebd')) + with mock.patch('pkgcore.ebuild.eapi.bash_version') as bash_version, \ +- mock.patch.dict(eapi.EAPI.known_eapis): ++ mock.patch.dict(eapi.EAPI.known_eapis), \ ++ mock.patch('pkgcore.ebuild.eapi.const.EBD_PATH', mock_ebd_temp): + # inadequate bash version + bash_version.return_value = '3.1' + with pytest.raises(SystemExit) as excinfo: diff --git a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild similarity index 95% rename from sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild rename to sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild index 9f732afa4d66..4c804c52bcce 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild @@ -40,6 +40,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.12.17-fix-prefix.patch" + "${FILESDIR}/${PN}-0.12.17-fix-extra-files.patch" ) distutils_enable_tests pytest