mirror
/
qutebrowser
mirror of https://github.com/qutebrowser/qutebrowser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt 6.10: Adjust CI test skipping

This commit is contained in:
Florian Bruhin 2025-07-21 13:45:51 +02:00
parent c9d3b61ca2
commit d80d80b867
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pytest.ini
View File

@ -42,8 +42,8 @@ markers =
qt6_only: Tests which should only run with Qt 6 qt6_only: Tests which should only run with Qt 6
qt5_xfail: Tests which fail with Qt 5 qt5_xfail: Tests which fail with Qt 5
qt6_xfail: Tests which fail with Qt 6 qt6_xfail: Tests which fail with Qt 6
qt69_ci_flaky: Tests which are flaky 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 qt69_ci_skip: Tests which should be skipped with Qt 6.9+ on CI
qt_log_level_fail = WARNING qt_log_level_fail = WARNING
qt_log_ignore = qt_log_ignore =
# GitHub Actions # GitHub Actions

8
tests/conftest.py
View File

@ -132,10 +132,10 @@ def _apply_platform_markers(config, item):
( (
config.webengine config.webengine
and version.qtwebengine_versions(avoid_init=True).webengine and version.qtwebengine_versions(avoid_init=True).webengine
== utils.VersionNumber(6, 9) > utils.VersionNumber(6, 9)
and testutils.ON_CI 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 "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 config.webengine
and version.qtwebengine_versions(avoid_init=True).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 and testutils.ON_CI
), ),
"Skipped with QtWebEngine 6.9 on CI", "Skipped with QtWebEngine 6.9+ on CI",
), ),
] ]