From 897be22576a166416a7f2b15e757b6690d024d9b Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Thu, 6 Feb 2020 16:56:10 -0600 Subject: [PATCH] app-crypt/certbot: fix testing, again Closes: https://bugs.gentoo.org/708506 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Matthew Thode --- ...ot-1.2.0.ebuild => certbot-1.2.0-r1.ebuild} | 18 ++++++++---------- app-crypt/certbot/certbot-9999.ebuild | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) rename app-crypt/certbot/{certbot-1.2.0.ebuild => certbot-1.2.0-r1.ebuild} (84%) diff --git a/app-crypt/certbot/certbot-1.2.0.ebuild b/app-crypt/certbot/certbot-1.2.0-r1.ebuild similarity index 84% rename from app-crypt/certbot/certbot-1.2.0.ebuild rename to app-crypt/certbot/certbot-1.2.0-r1.ebuild index ec673774775d..c81039179f59 100644 --- a/app-crypt/certbot/certbot-1.2.0.ebuild +++ b/app-crypt/certbot/certbot-1.2.0-r1.ebuild @@ -38,14 +38,12 @@ RDEPEND=" dev-python/pytz[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - # acme is not installed, removing it here is fine, the dir just confuses tests - rm -R ../acme - pytest -vv ${PN} || die +DEPEND="${CDEPEND}" + +distutils_enable_tests pytest + +python_prepare_all() { + # required as deps of deps can trigger this too... + echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini + distutils-r1_python_prepare_all } diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild index ec673774775d..c81039179f59 100644 --- a/app-crypt/certbot/certbot-9999.ebuild +++ b/app-crypt/certbot/certbot-9999.ebuild @@ -38,14 +38,12 @@ RDEPEND=" dev-python/pytz[${PYTHON_USEDEP}] dev-python/zope-component[${PYTHON_USEDEP}] dev-python/zope-interface[${PYTHON_USEDEP}]" -DEPEND=" - ${CDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - # acme is not installed, removing it here is fine, the dir just confuses tests - rm -R ../acme - pytest -vv ${PN} || die +DEPEND="${CDEPEND}" + +distutils_enable_tests pytest + +python_prepare_all() { + # required as deps of deps can trigger this too... + echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini + distutils-r1_python_prepare_all } -- 2.26.2