commit: ad80bcbb0fb4b7ddca33a27f7f450fd6baa2cf54 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Nov 11 17:33:06 2022 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> 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 <arthurzam <AT> 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
