summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-31 12:15:04 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-03-31 13:57:51 +0200
commitd59a189987f812b024d197e80a4437b39d75ccc3 (patch)
treef258c1c70cff92c16423f4e507accfe1c57d89f9
parente1ea8de74f6784c142a3a11267e19a27fe3ff33a (diff)
downloadqutebrowser-d59a189987f812b024d197e80a4437b39d75ccc3.tar.gz
qutebrowser-d59a189987f812b024d197e80a4437b39d75ccc3.zip
tests: Skip test_real_chromium_version if guessing too muchv2.1.x-dev
(cherry picked from commit c7657e65cc2eea04aee70d466b436c675707c270)
-rw-r--r--tests/unit/utils/test_version.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 1e2b926c5..8515badbf 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -997,17 +997,22 @@ class TestWebEngineVersions:
def test_real_chromium_version(self, qapp):
"""Compare the inferred Chromium version with the real one."""
- if '.dev' in PYQT_VERSION_STR:
- pytest.skip("dev version of PyQt5")
-
- try:
- from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION_STR
- except ImportError as e:
- # QtWebKit or QtWebEngine < 5.13
- pytest.skip(str(e))
-
pyqt_webengine_version = version._get_pyqt_webengine_qt_version()
if pyqt_webengine_version is None:
+ if '.dev' in PYQT_VERSION_STR:
+ pytest.skip("dev version of PyQt5")
+
+ try:
+ from PyQt5.QtWebEngine import (
+ PYQT_WEBENGINE_VERSION_STR, PYQT_WEBENGINE_VERSION)
+ except ImportError as e:
+ # QtWebKit or QtWebEngine < 5.13
+ pytest.skip(str(e))
+
+ if PYQT_WEBENGINE_VERSION >= 0x050F02:
+ # Starting with Qt 5.15.2, we can only do bad guessing anyways...
+ pytest.skip("Could be QtWebEngine 5.15.2 or 5.15.3")
+
pyqt_webengine_version = PYQT_WEBENGINE_VERSION_STR
versions = version.WebEngineVersions.from_pyqt(pyqt_webengine_version)