From d9f29aec5367ea00739651103b0dae6d73fc73d438f9999c86444c2641846542 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Sat, 22 Jan 2022 14:50:56 +0000
Subject: [PATCH] Accepting request 948103 from
 home:bnavigator:branches:devel:languages:python

- Work around xdist related conftest import error

OBS-URL: https://build.opensuse.org/request/show/948103
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cheroot?expand=0&rev=42
---
 python-cheroot.changes | 5 +++++
 python-cheroot.spec    | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/python-cheroot.changes b/python-cheroot.changes
index 9e71e5a..73e5e1d 100644
--- a/python-cheroot.changes
+++ b/python-cheroot.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jan 22 12:25:02 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Work around xdist related conftest import error
+
 -------------------------------------------------------------------
 Fri Jan 21 16:53:38 UTC 2022 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-cheroot.spec b/python-cheroot.spec
index ce45c6a..36097f7 100644
--- a/python-cheroot.spec
+++ b/python-cheroot.spec
@@ -104,15 +104,16 @@ sed -i '/--cov/ d' pytest.ini
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
+mkdir testclean
+pushd testclean
 %if %{with ringdisabled}
 # skip this test file (1 test only) in Factory staging, because we
 # do not want to add python-jaraco.context to Ring1
 pytest_opts="--ignore  cheroot/test/test_wsgi.py"
 %endif
-# https://github.com/cherrypy/cheroot/issues/355
-pytest_opts+=" -p no:threadexception"
 # test_tls_client_auth[...-False-localhost-builtin] fails ocassionally on server-side OBS
-%pytest $pytest_opts -k "not (test_tls_client_auth and False-localhost-builtin)"
+%pytest --pyargs cheroot $pytest_opts -k "not (test_tls_client_auth and False-localhost-builtin)"
+popd
 
 %pre
 # If libalternatives is used: Removing old update-alternatives entries.