From d8ae32a002ae361408c368682c2f7e5a1b3a716d6d79f625bbced9f9ebef709d Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 21 Nov 2024 22:31:57 +0000 Subject: [PATCH] - Don't use pytest-xdist, it breaks test suite. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=278 --- python-setuptools.changes | 1 + python-setuptools.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python-setuptools.changes b/python-setuptools.changes index 9e30761..11e1223 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -2,6 +2,7 @@ Thu Nov 21 12:01:23 UTC 2024 - Matej Cepl - Skip over the tests which require network. +- Don't use pytest-xdist, it breaks test suite. ------------------------------------------------------------------- Thu Nov 21 11:35:52 UTC 2024 - Dirk Müller diff --git a/python-setuptools.spec b/python-setuptools.spec index d3de1dd..a49f305 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -60,7 +60,7 @@ BuildRequires: %{python_module pytest >= 6} BuildRequires: %{python_module pytest-home >= 0.5} BuildRequires: %{python_module pytest-subprocess} BuildRequires: %{python_module pytest-timeout} -BuildRequires: %{python_module pytest-xdist >= 3} +# BuildRequires: %%{python_module pytest-xdist >= 3} BuildRequires: %{python_module setuptools = %{version}} BuildRequires: %{python_module setuptools-wheel = %{version}} BuildRequires: %{python_module tomli-w >= 1.0.0} @@ -126,7 +126,7 @@ donttest="(test_apply_pyproject_equivalent_to_setupcfg and https)" # no network access donttest+=" or uses_network" # test_pbr_integration tries to install pbr from network using pip -donttest+=" test_pbr_integration" +donttest+=" or test_pbr_integration" # looks for .exe files that we do not ship donttest+=" or test_wheel_includes_cli_scripts" # ignores environment variables @@ -134,7 +134,7 @@ donttest+=" or test_setup_requires_with_distutils_command_dep" donttest+=" or test_setup_requires_with_transitive_extra_dependency" # skip tests that require network access donttest+=" or uses_network" -%pytest -rfE -n auto -k "not ($donttest)" +%pytest -rfE -k "not ($donttest)" %endif %if %{without test}