From a50f2ca09542794bf87e9f3a518d88fecdc0a2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 18 Nov 2023 16:52:00 +0100 Subject: python-utils-r1.eclass: Do not pass `-p xdist` w/ PYTEST_PLUGINS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix `epytest` with `EPYTEST_XDIST` not to pass a duplicate `-p xdist` when `xdist.plugin` is already present in `PYTEST_PLUGINS`. Otherwise, pytest will fail due to the plugin being loaded twice. Signed-off-by: Michał Górny --- eclass/python-utils-r1.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'eclass/python-utils-r1.eclass') diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 80abe974f9df..1de4f325de33 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1390,10 +1390,14 @@ epytest() { if [[ ${EPYTEST_XDIST} ]]; then local jobs=${EPYTEST_JOBS:-$(makeopts_jobs)} if [[ ${jobs} -gt 1 ]]; then + if [[ ${PYTEST_PLUGINS} != *xdist.plugin* ]]; then + args+=( + # explicitly enable the plugin, in case the ebuild was + # using PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + -p xdist + ) + fi args+=( - # explicitly enable the plugin, in case the ebuild was using - # PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - -p xdist -n "${jobs}" # worksteal ensures that workers don't end up idle when heavy # jobs are unevenly distributed -- cgit v1.2.3