From f77aeeb563caa6208261dab9974287fde18576cc Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 2 Feb 2024 17:59:34 +0000 Subject: [PATCH] Remove test timeouts These are not pertinent to the RPM builds. We just want to know whether the tests succeed or not, not how long they take on our builders. --- scipy.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scipy.spec b/scipy.spec index f916130..b1bd0a2 100644 --- a/scipy.spec +++ b/scipy.spec @@ -156,8 +156,8 @@ for f in $(grep -Frl numpy.distutils); do rm $f.orig done -# Do not do benchmarking or coverage testing for RPM builds -sed -Ei '/^[[:blank:]]*"(asv|pytest-cov)"/d' pyproject.toml +# Do not do benchmarking, coverage, or timeout testing for RPM builds +sed -Ei '/^[[:blank:]]*"(asv|pytest-cov|pytest-timeout)"/d' pyproject.toml # No scikit-umfpack in Fedora sed -i '/^[[:blank:]]*"scikit-umfpack"/d' pyproject.toml @@ -228,29 +228,20 @@ chmod 0755 %{buildroot}%{python3_sitearch}/scipy/sparse/linalg/_isolve/tests/tes # check against the reference BLAS/LAPACK export FLEXIBLAS=netlib -# default test timeout -TIMEOUT=500 - # TestDatasets try to download from the internet SKIP_ALL="not TestDatasets" export PYTEST_ADDOPTS="-k '$SKIP_ALL'" -%ifarch ppc64le -TIMEOUT=1000 -%endif - %ifarch aarch64 # TestConstructUtils::test_concatenate_int32_overflow is flaky on aarch64 export PYTEST_ADDOPTS="-k '$SKIP_ALL and \ not test_concatenate_int32_overflow'" -TIMEOUT=1000 %endif %ifarch s390x # https://bugzilla.redhat.com/show_bug.cgi?id=1959353 export PYTEST_ADDOPTS="-k '$SKIP_ALL and \ not test_distance_transform_cdt05'" -TIMEOUT=1000 %endif %ifarch x86_64 @@ -269,7 +260,7 @@ not test_svdp'" %endif pushd %{buildroot}/%{python3_sitearch} -%{pytest} --timeout=${TIMEOUT} scipy %{?!rhel:--numprocesses=auto} +%{pytest} scipy %{?!rhel:--numprocesses=auto} # Remove test remnants rm -rf gram{A,B} rm -rf .pytest_cache