@@ -0,0 +1,41 @@
|
||||
From 7f5c9626d838e68ea03cc04e6e5b88986762458c Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Oliveira <bruno@pytest.org>
|
||||
Date: Tue, 11 Nov 2025 07:55:54 -0300
|
||||
Subject: [PATCH] Fix CI for pytest 9.0+
|
||||
|
||||
---
|
||||
testing/test_remote.py | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/testing/test_remote.py b/testing/test_remote.py
|
||||
index 909f7ca2..ae82e2b7 100644
|
||||
--- a/testing/test_remote.py
|
||||
+++ b/testing/test_remote.py
|
||||
@@ -378,6 +378,11 @@ def test_mainargv(request):
|
||||
|
||||
|
||||
def test_remote_usage_prog(pytester: pytest.Pytester) -> None:
|
||||
+ if pytest.version_tuple[:2] >= (9, 0):
|
||||
+ get_optparser_expr = "get_config_parser.optparser"
|
||||
+ else:
|
||||
+ get_optparser_expr = "get_config_parser._getparser()"
|
||||
+
|
||||
pytester.makeconftest(
|
||||
"""
|
||||
import pytest
|
||||
@@ -394,12 +399,12 @@ def pytest_configure(config):
|
||||
"""
|
||||
)
|
||||
pytester.makepyfile(
|
||||
- """
|
||||
+ f"""
|
||||
import sys
|
||||
|
||||
def test(get_config_parser, request):
|
||||
- get_config_parser._getparser().error("my_usage_error")
|
||||
- """
|
||||
+ {get_optparser_expr}.error("my_usage_error")
|
||||
+ """
|
||||
)
|
||||
|
||||
result = pytester.runpytest_subprocess("-n1")
|
||||
@@ -0,0 +1,23 @@
|
||||
From 46084729fd2785c626d8c4add0b5e695eb4fdde9 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Oliveira <bruno@soliv.dev>
|
||||
Date: Sun, 2 Nov 2025 10:18:21 -0300
|
||||
Subject: [PATCH] Adapt test to also worth with pytest-main
|
||||
|
||||
---
|
||||
testing/test_newhooks.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/testing/test_newhooks.py b/testing/test_newhooks.py
|
||||
index e3a8ac6f..9091ed31 100644
|
||||
--- a/testing/test_newhooks.py
|
||||
+++ b/testing/test_newhooks.py
|
||||
@@ -115,7 +115,7 @@ def pytest_handlecrashitem(crashitem, report, sched):
|
||||
res.stdout.fnmatch_lines_random(["*HOOK: pytest_handlecrashitem"])
|
||||
res.stdout.fnmatch_lines(
|
||||
[
|
||||
- "FAILED test_handlecrashitem_one.py::test_b",
|
||||
- "FAILED test_handlecrashitem_one.py::test_b",
|
||||
+ "FAILED test_handlecrashitem_one.py::test_b*",
|
||||
+ "FAILED test_handlecrashitem_one.py::test_b*",
|
||||
]
|
||||
)
|
||||
@@ -0,0 +1,72 @@
|
||||
# SPDX-FileCopyrightText: (C) 2026 Institute of Software, Chinese Academy of Sciences (ISCAS)
|
||||
# SPDX-FileCopyrightText: (C) 2026 openRuyi Project Contributors
|
||||
# SPDX-FileContributor: Jvle <keke.oerv@isrc.iscas.ac.cn>
|
||||
#
|
||||
# SPDX-License-Identifier: MulanPSL-2.0
|
||||
|
||||
%global srcname pytest-xdist
|
||||
%global binary_name pytest_xdist
|
||||
%bcond tests 1
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 3.8.0
|
||||
Release: %autorelease
|
||||
Summary: pytest plugin for distributed testing and loop-on-failing modes
|
||||
License: MIT
|
||||
URL: https://github.com/pytest-dev/pytest-xdist
|
||||
#!RemoteAsset
|
||||
Source0: https://files.pythonhosted.org/packages/source/p/%{binary_name}/%{binary_name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildSystem: pyproject
|
||||
|
||||
BuildOption(install): -l xdist
|
||||
|
||||
BuildRequires: pkgconfig(python)
|
||||
BuildRequires: python3dist(execnet) >= 1.1
|
||||
BuildRequires: python3dist(filelock)
|
||||
BuildRequires: python3dist(setproctitle)
|
||||
BuildRequires: python3dist(psutil) >= 3
|
||||
BuildRequires: python3dist(pytest) >= 6
|
||||
BuildRequires: python3dist(pytest-forked)
|
||||
BuildRequires: python3dist(setuptools)
|
||||
BuildRequires: python3dist(setuptools-scm)
|
||||
Requires: python3dist(execnet) >= 2.1
|
||||
Requires: python3dist(pytest) >= 7.0.0
|
||||
Recommends: python3dist(psutil) >= 3.0
|
||||
Recommends: python3dist(filelock)
|
||||
Recommends: python3dist(setproctitle)
|
||||
|
||||
Provides: python3-%{srcname}
|
||||
%python_provide python3-%{srcname}
|
||||
|
||||
# Update baipp to 2.14 #1266 https://github.com/pytest-dev/pytest-xdist/pull/1266/commits/46084729fd2785c626d8c4add0b5e695eb4fdde9
|
||||
# Fix CI for pytest 9.0+ #1272 https://github.com/pytest-dev/pytest-xdist/pull/1272
|
||||
%patchlist
|
||||
python-pytest-xdist-3.8.0-fix-for-pytest-9.0+.patch
|
||||
python-pytest-xdist-3.8.0-update-biapp.patch
|
||||
|
||||
%description
|
||||
The pytest-xdist plugin extends pytest with new test execution
|
||||
modes, the most used being distributing tests across multiple
|
||||
CPUs to speed up test execution.
|
||||
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires
|
||||
|
||||
%prep -a
|
||||
sed -i 's/\r//' README.rst
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
export CI=true
|
||||
# temp skip failed test cases due to internal API changes in pytest 9.0
|
||||
%pytest -v \
|
||||
-k "not test_remote_usage_prog and not test_handlecrashitem_one"
|
||||
%endif
|
||||
|
||||
%files -f %{pyproject_files}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
|
||||
%changelog
|
||||
%{?autochangelog}
|
||||
Reference in New Issue
Block a user