From d59a189987f812b024d197e80a4437b39d75ccc3 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 31 Mar 2021 12:15:04 +0200 Subject: tests: Skip test_real_chromium_version if guessing too much (cherry picked from commit c7657e65cc2eea04aee70d466b436c675707c270) --- tests/unit/utils/test_version.py | 23 ++++++++++++++--------- 1 file 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) -- cgit v1.2.3-54-g00ecf