From 15f5030c3efe0823481c03eb5930f204055f35ff Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 25 Nov 2024 22:14:18 -0500
Subject: [PATCH] Run the tests (unconditionally)

---
 python-zmq.spec | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/python-zmq.spec b/python-zmq.spec
index 3b98f90..c7a1fc5 100644
--- a/python-zmq.spec
+++ b/python-zmq.spec
@@ -1,5 +1,3 @@
-%bcond_with tests
-
 Name:           python-zmq
 Version:        19.0.0
 Release:        %autorelease
@@ -15,17 +13,9 @@ BuildRequires:  %{_bindir}/pathfix.py
 
 BuildRequires:  zeromq-devel
 
-# For some tests
-# czmq currently FTBFS, so enable it some time later
-#BuildRequires:  czmq-devel
-
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-Cython
-%if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-tornado
-%endif
 
 %global common_description %{expand:
 This package contains Python bindings for ZeroMQ. ØMQ is a lightweight and fast
@@ -52,6 +42,17 @@ Requires:       python%{python3_pkgversion}-zmq = %{version}-%{release}
 %{?python_provide:%python_provide python%{python3_pkgversion}-pyzmq-tests}
 Provides:       python%{python3_pkgversion}-pyzmq-tests = %{version}-%{release}
 
+BuildRequires:  python%{python3_pkgversion}-pytest
+Requires:       python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-tornado
+Requires:       python%{python3_pkgversion}-tornado
+# Some tests in zmq/tests/test_context.py and zmq/tests/test_socket.py require
+# pyczmq, which is not packaged and has not been updated in a decade.
+#
+# Enable more tests in zmq/tests/test_message.py:
+BuildRequires:  python%{python3_pkgversion}-numpy
+Requires:       python%{python3_pkgversion}-numpy
+
 %description -n python%{python3_pkgversion}-zmq-tests %{common_description}
 
 This package contains the test suite for the Python bindings.
@@ -93,12 +94,26 @@ pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitearch}
 
 
 %check
-%if %{with tests}
-    # Make sure we import from the install directory
-    #rm zmq/__*.py
-    PYTHONPATH=%{buildroot}%{python3_sitearch} \
-        %{__python3} setup.py test
-%endif
+# to avoid partially initialized zmq module from cwd
+mkdir -p _empty
+cd _empty
+ln -s %{buildroot}%{python3_sitearch}/zmq/ ../pytest.ini ./
+
+# test_draft seems to get incorrectly run:
+# https://github.com/zeromq/pyzmq/issues/1853
+k="${k-}${k+ and }not test_draft"
+
+# Whatever it takes to build the Cython extension tests/cython_ext.pyx that is
+# *in the tests*, we aren’t doing it. This goes away in later releases, so we
+# don’t put any effort into figuring out how to make it work.
+k="${k-}${k+ and }not test_cython"
+
+# These hang; TODO: why?
+k="${k-}${k+ and }not (TestAsyncioAuthentication and test_blacklist)"
+k="${k-}${k+ and }not (TestAsyncioAuthentication and test_curve)"
+k="${k-}${k+ and }not (TestAsyncioAuthentication and test_plain)"
+
+%pytest -k "${k-}" -v -rs zmq/tests
 
 
 %files -n python%{python3_pkgversion}-zmq