Sync from SUSE:SLFO:Main python-pytest-qt revision 4194afe91598137b56ee25f93bc59e96

This commit is contained in:
2025-03-25 14:34:23 +01:00
parent 6d0a3de606
commit 3e426da527
3 changed files with 49 additions and 2 deletions

34
fix-pyside6-test.patch Normal file
View File

@@ -0,0 +1,34 @@
From: Antonio Larrosa <alarrosa@suse.com>
Subject: Fix test_qinfo when building with latest pyside6
The qInfo test fails when detecting it's running with pyside because
it assumes pyside2/6 doesn't expose qInfo. But pyside6 does. So we
can just remove the case from the condition and let the qInfo test
run normally.
Index: pytest-qt-4.4.0/tests/test_logging.py
===================================================================
--- pytest-qt-4.4.0.orig/tests/test_logging.py
+++ pytest-qt-4.4.0/tests/test_logging.py
@@ -3,6 +3,7 @@ import datetime
import pytest
from pytestqt.qt_compat import qt_api
+from packaging.version import Version
@pytest.mark.parametrize("test_succeeds", [True, False])
@@ -72,7 +73,12 @@ def test_qinfo(qtlog):
the other logging tests properly. #232
"""
- if qt_api.is_pyside:
+ if qt_api.pytest_qt_api == "pyside6":
+ import PySide6
+ pyside6_version = Version(PySide6.__version__)
+
+ if (qt_api.pytest_qt_api == "pyside2" or
+ (qt_api.pytest_qt_api == "pyside6" and pyside6_version < Version("6.8.2"))):
assert (
qt_api.qInfo is None
), "pyside2/6 does not expose qInfo. If it does, update this test."

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Feb 27 09:22:15 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
- Add patch to fix a test that fails when building with the latest
pyside6 instead of skipping it:
* fix-pyside6-test.patch
-------------------------------------------------------------------
Wed Feb 26 13:29:50 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
- Skip test_qtinfo failing test with latest python3-pyside6
-------------------------------------------------------------------
Wed May 29 10:45:04 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-qt
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -72,6 +72,7 @@ License: MIT
Group: Development/Languages/Python
URL: https://github.com/pytest-dev/pytest-qt
Source: https://files.pythonhosted.org/packages/source/p/pytest-qt/pytest-qt-%{version}.tar.gz
Patch0: fix-pyside6-test.patch
BuildRequires: %{python_module base >= 3.8}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module setuptools_scm}
@@ -103,7 +104,7 @@ creation as needed and provides methods to simulate user interaction,
like key presses and mouse clicks.
%prep
%setup -q -n pytest-qt-%{version}
%autosetup -p1 -n pytest-qt-%{version}
dos2unix LICENSE
# https://github.com/pytest-dev/pytest-qt/pull/419#discussion_r1240198866
sed -i /xfail_strict/d setup.cfg