From d80d80b867982980cf40d7d2c85f5a8fc2fdf98e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 21 Jul 2025 13:45:51 +0200 Subject: [PATCH] Qt 6.10: Adjust CI test skipping --- pytest.ini | 4 ++-- tests/conftest.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytest.ini b/pytest.ini index ed010798d..e3b8e4376 100644 --- a/pytest.ini +++ b/pytest.ini @@ -42,8 +42,8 @@ markers = qt6_only: Tests which should only run with Qt 6 qt5_xfail: Tests which fail with Qt 5 qt6_xfail: Tests which fail with Qt 6 - qt69_ci_flaky: Tests which are flaky with Qt 6.9 on CI - qt69_ci_skip: Tests which should be skipped with Qt 6.9 on CI + qt69_ci_flaky: Tests which are flaky with Qt 6.9+ on CI + qt69_ci_skip: Tests which should be skipped with Qt 6.9+ on CI qt_log_level_fail = WARNING qt_log_ignore = # GitHub Actions diff --git a/tests/conftest.py b/tests/conftest.py index 1efb53804..bdf974b1f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -132,10 +132,10 @@ def _apply_platform_markers(config, item): ( config.webengine and version.qtwebengine_versions(avoid_init=True).webengine - == utils.VersionNumber(6, 9) + > utils.VersionNumber(6, 9) and testutils.ON_CI ), - "Flaky with QtWebEngine 6.9 on CI", + "Flaky with QtWebEngine 6.9+ on CI", ), ( "qt69_ci_skip", # WORKAROUND: https://github.com/qutebrowser/qutebrowser/issues/8444#issuecomment-2569610110 @@ -143,10 +143,10 @@ def _apply_platform_markers(config, item): ( config.webengine and version.qtwebengine_versions(avoid_init=True).webengine - in [utils.VersionNumber(6, 9), utils.VersionNumber(6, 9, 1)] + > utils.VersionNumber(6, 9) and testutils.ON_CI ), - "Skipped with QtWebEngine 6.9 on CI", + "Skipped with QtWebEngine 6.9+ on CI", ), ]