From 7cb013fa5badfe31ab8975d77062f2e46f85c4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 3 Mar 2023 14:11:10 +0100
Subject: [PATCH] app-shells/bash-completion: Use epytest to run tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../bash-completion-2.11.ebuild               | 23 +++++++++++--------
 .../bash-completion-9999.ebuild               | 23 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild
index 67ec99d5b6ca7..5ee98932da25a 100644
--- a/app-shells/bash-completion/bash-completion-2.11.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.11.ebuild
@@ -89,20 +89,25 @@ src_prepare() {
 		eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
 	fi
 
-	# redhat-specific, we strip these completions
-	rm test/t/test_if{down,up}.py || die
-	# not available for icedtea
-	rm test/t/test_javaws.py || die
-
 	eapply_user
 }
 
 src_test() {
+	local EPYTEST_DESELECT=(
+		# redhat-specific, we strip these completions
+		test/t/test_if{down,up}.py
+		# not available for icedtea
+		test/t/test_javaws.py
+	)
+
 	# portage's HOME override breaks tests
-	local myhome=$(unset HOME; echo ~)
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "${myhome}"
-	emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
+	local -x HOME=$(unset HOME; echo ~)
+	addpredict "${HOME}"
+	# used in pytest tests
+	local -x NETWORK=none
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	emake -C completions check
+	epytest
 }
 
 src_install() {
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index a95ffccbac98f..8d39bca2b2422 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -94,21 +94,26 @@ src_prepare() {
 		eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
 	fi
 
-	# redhat-specific, we strip these completions
-	rm test/t/test_if{down,up}.py || die
-	# not available for icedtea
-	rm test/t/test_javaws.py || die
-
 	eapply_user
 	eautoreconf
 }
 
 src_test() {
+	local EPYTEST_DESELECT=(
+		# redhat-specific, we strip these completions
+		test/t/test_if{down,up}.py
+		# not available for icedtea
+		test/t/test_javaws.py
+	)
+
 	# portage's HOME override breaks tests
-	local myhome=$(unset HOME; echo ~)
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "${myhome}"
-	emake check HOME="${myhome}" PYTESTFLAGS="-vv" NETWORK=none
+	local -x HOME=$(unset HOME; echo ~)
+	addpredict "${HOME}"
+	# used in pytest tests
+	local -x NETWORK=none
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	emake -C completions check
+	epytest
 }
 
 src_install() {