diff --git a/.gitignore b/.gitignore index 164870c..3fc6c94 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pytest-forked-1.2.0.tar.gz /pytest-forked-1.3.0.tar.gz /pytest-forked-1.4.0.tar.gz +/pytest-forked-1.5.0.tar.gz diff --git a/de584eda15df6db7912ab6197cfb9ff23024ef23.patch b/de584eda15df6db7912ab6197cfb9ff23024ef23.patch deleted file mode 100644 index 9604342..0000000 --- a/de584eda15df6db7912ab6197cfb9ff23024ef23.patch +++ /dev/null @@ -1,47 +0,0 @@ -From de584eda15df6db7912ab6197cfb9ff23024ef23 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Tue, 6 Dec 2022 09:20:18 -0500 -Subject: [PATCH] Fix test_xfail_behavior with pytest 7.2.0+ - -In https://github.com/pytest-dev/pytest/commit/69fb79e741f00714d3ac14ee853c5506f154e94f, -pytest output was changed to include the reason string on the same line as -the short test summary, so the test needs to be updated correspondingly. ---- - testing/test_xfail_behavior.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/testing/test_xfail_behavior.py b/testing/test_xfail_behavior.py -index ef00385..15edd93 100644 ---- a/testing/test_xfail_behavior.py -+++ b/testing/test_xfail_behavior.py -@@ -6,6 +6,7 @@ - - IS_PYTEST4_PLUS = int(pytest.__version__[0]) >= 4 # noqa: WPS609 - FAILED_WORD = "FAILED" if IS_PYTEST4_PLUS else "FAIL" -+PYTEST_GTE_7_2 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 2) # type: ignore[attr-defined] - - pytestmark = pytest.mark.skipif( # pylint: disable=invalid-name - not hasattr(os, "fork"), # noqa: WPS421 -@@ -68,10 +69,12 @@ def test_xfail(is_crashing, is_strict, testdir): - ) - ) - reason_string = ( -- " reason: The process gets terminated; " -+ "reason: The process gets terminated; " - "pytest-forked reason: " - "*:*: running the test CRASHED with signal {sig_num:d}".format(**locals()) - ) -+ if expected_lowercase == "xfailed" and PYTEST_GTE_7_2: -+ short_test_summary += " - " + reason_string - total_summary_line = "*==== 1 {expected_lowercase!s} in 0.*s* ====*".format( - **locals() - ) -@@ -95,7 +98,7 @@ def test_xfail(is_crashing, is_strict, testdir): - ) - if expected_lowercase == "xpassed" and expected_word == FAILED_WORD: - # XPASS(strict) -- expected_lines += (reason_string,) -+ expected_lines += (" " + reason_string,) - expected_lines += (total_summary_line,) - - test_module = testdir.makepyfile( diff --git a/python-pytest-forked.spec b/python-pytest-forked.spec index b0c2c11..1358259 100644 --- a/python-pytest-forked.spec +++ b/python-pytest-forked.spec @@ -1,14 +1,13 @@ %global pypi_name pytest-forked Name: python-%{pypi_name} -Version: 1.4.0 -Release: 6%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: py.test plugin for running tests in isolated forked subprocesses License: MIT URL: https://github.com/pytest-dev/pytest-forked Source0: %{pypi_source} -Patch0: de584eda15df6db7912ab6197cfb9ff23024ef23.patch BuildArch: noarch BuildRequires: python3-devel @@ -48,6 +47,9 @@ Requires: %{py3_dist py} %{python3_sitelib}/pytest_forked* %changelog +* Sun Feb 12 2023 Scott Talbert - 1.5.0-1 +- Update to new upstream release 1.5.0 (#2169197) + * Tue Jan 24 2023 Scott Talbert - 1.4.0-6 - Fix FTBFS with pytest 7.2.0+ diff --git a/sources b/sources index aa7753e..2b106fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pytest-forked-1.4.0.tar.gz) = ba402aec6dbec7a94815913192a49390b637a123d3557f48d809ae2e871e9e0cff8f9d0feb99e2bd06fe9486520b5e539f397d39475a720f8283b1bd21c751c7 +SHA512 (pytest-forked-1.5.0.tar.gz) = 9d7d1917a6f2dc482488b9b81c284e7d9b55133d667bdbade75f6d5c30fb8d4fd9dfd1d14b1cf7b7ce12e4a64daa99fcd1b7f0a954a5a3ac37cb1fee809a1b0f