diff options
| author | Florian Bruhin <me@the-compiler.org> | 2019-03-18 11:22:43 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2019-03-18 11:44:47 +0100 |
| commit | 829779949e77a1082a5a08b0b1241dfbc740ed5f (patch) | |
| tree | a364375b347318340be36988d0cef29a0fc8f90c | |
| parent | 99a4f4a034b2f3460118ed8e6b80373e42e2194e (diff) | |
| download | qutebrowser-829779949e77a1082a5a08b0b1241dfbc740ed5f.tar.gz qutebrowser-829779949e77a1082a5a08b0b1241dfbc740ed5f.zip | |
Fix double-registering of schemes in test_webenginesettings
| -rw-r--r-- | qutebrowser/browser/webengine/webenginequtescheme.py | 1 | ||||
| -rw-r--r-- | tests/unit/browser/webengine/test_webenginesettings.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py index 132005878..7f21cdba1 100644 --- a/qutebrowser/browser/webengine/webenginequtescheme.py +++ b/qutebrowser/browser/webengine/webenginequtescheme.py @@ -163,6 +163,7 @@ def init(): classes. """ if QWebEngineUrlScheme is not None: + assert QWebEngineUrlScheme.schemeByName(b'qute') is None scheme = QWebEngineUrlScheme(b'qute') scheme.setFlags(QWebEngineUrlScheme.LocalScheme | QWebEngineUrlScheme.LocalAccessAllowed) diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py index 7eea8ffa7..5746586e7 100644 --- a/tests/unit/browser/webengine/test_webenginesettings.py +++ b/tests/unit/browser/webengine/test_webenginesettings.py @@ -30,7 +30,9 @@ from qutebrowser.misc import objects @pytest.fixture(autouse=True) -def init(qapp, config_stub, cache_tmpdir, data_tmpdir): +def init(qapp, config_stub, cache_tmpdir, data_tmpdir, monkeypatch): + monkeypatch.setattr(webenginesettings.webenginequtescheme, 'init', + lambda: None) init_args = types.SimpleNamespace(enable_webengine_inspector=False) webenginesettings.init(init_args) config_stub.changed.disconnect(webenginesettings._update_settings) |