diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-05-13 16:42:34 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-05-13 16:42:34 +0200 |
| commit | ac12fcd714c699f927170b3d0508336940366bac (patch) | |
| tree | 81c26e7643158ac800781877d1fe242c04f07bfc | |
| parent | 9e52ad621ac44d0391c2c6d9dbdda967f7ce95f0 (diff) | |
| download | qutebrowser-ac12fcd714c699f927170b3d0508336940366bac.tar.gz qutebrowser-ac12fcd714c699f927170b3d0508336940366bac.zip | |
Fix tests without QtWebEngine
| -rw-r--r-- | qutebrowser/config/configfiles.py | 2 | ||||
| -rw-r--r-- | tests/unit/config/test_configfiles.py | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 6d800fd13..a3320c5c1 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -118,7 +118,7 @@ class StateConfig(configparser.ConfigParser): Note that it's too early to use objects.backend here... """ try: - from PyQt5 import QtWebEngineWidgets # pylint: disable=unused-import + import PyQt5.QtWebEngineWidgets # pylint: disable=unused-import except ImportError: return 'no' return str(version.qtwebengine_versions(avoid_init=True).webengine) diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py index 140813990..65952ddb4 100644 --- a/tests/unit/config/test_configfiles.py +++ b/tests/unit/config/test_configfiles.py @@ -166,6 +166,11 @@ def state_writer(data_tmpdir): @pytest.fixture def qtwe_version_patcher(monkeypatch): + try: + from PyQt5 import QtWebEngineWidgets # pylint: disable=unused-import + except ImportError: + pytest.skip("QtWebEngine not available") + def patch(ver): monkeypatch.setattr( configfiles.version, @@ -217,6 +222,15 @@ def test_qtwe_version_changed(state_writer, qtwe_version_patcher, assert state.qtwe_version_changed == changed +def test_qtwe_version_changed_webkit(stubs, monkeypatch, state_writer): + fake = stubs.ImportFake({'PyQt5.QtWebEngineWidgets': False}, monkeypatch) + fake.patch() + + state_writer('qtwe_version', 'no') + state = configfiles.StateConfig() + assert not state.qtwe_version_changed + + @pytest.mark.parametrize('old_version, new_version, expected', [ (None, '2.0.0', configfiles.VersionChange.unknown), ('1.14.1', '1.14.1', configfiles.VersionChange.equal), |