summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-11-23 19:56:55 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-11-23 21:56:13 +0100
commit23b33524b131a0cb54ddfc1d359b6767c980a375 (patch)
tree6a12c251fbed6dfbabcfe9a9eb748c0a6638bd44
parent61b1ff2706bc1d75a227322600cec46f75b7b08b (diff)
downloadqutebrowser-23b33524b131a0cb54ddfc1d359b6767c980a375.tar.gz
qutebrowser-23b33524b131a0cb54ddfc1d359b6767c980a375.zip
tests: Fix Qt version check patching
(partially cherry picked from commits 451d912bc76fffa5478ce051fa89e101438170e0 and a14d0d433eec6edb5c9ecb872d458b5793c7f2bd)
-rw-r--r--tests/unit/config/test_qtargs.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py
index 817dc1967..fd1c3e826 100644
--- a/tests/unit/config/test_qtargs.py
+++ b/tests/unit/config/test_qtargs.py
@@ -49,8 +49,7 @@ class TestQtArgs:
@pytest.fixture(autouse=True)
def reduce_args(self, monkeypatch, config_stub):
"""Make sure no --disable-shared-workers/referer argument get added."""
- monkeypatch.setattr(qtargs.qtutils, 'version_check',
- lambda version, compiled=False: True)
+ monkeypatch.setattr(qtargs.qtutils, 'qVersion', lambda: '5.15.0')
config_stub.val.content.headers.referer = 'always'
@pytest.mark.parametrize('args, expected', [
@@ -103,7 +102,7 @@ class TestQtArgs:
def test_shared_workers(self, config_stub, monkeypatch, parser,
backend, expected):
monkeypatch.setattr(qtargs.qtutils, 'version_check',
- lambda version, compiled=False: False)
+ lambda version, compiled=False, exact=False: False)
monkeypatch.setattr(qtargs.objects, 'backend', backend)
parsed = parser.parse_args([])
args = qtargs.qt_args(parsed)
@@ -125,7 +124,7 @@ class TestQtArgs:
def test_in_process_stack_traces(self, monkeypatch, parser, backend,
version_check, debug_flag, expected):
monkeypatch.setattr(qtargs.qtutils, 'version_check',
- lambda version, compiled=False: version_check)
+ lambda version, compiled=False, exact=False: version_check)
monkeypatch.setattr(qtargs.objects, 'backend', backend)
parsed = parser.parse_args(['--debug-flag', 'stack'] if debug_flag
else [])
@@ -187,7 +186,8 @@ class TestQtArgs:
usertypes.Backend.QtWebEngine)
config_stub.val.content.autoplay = autoplay
monkeypatch.setattr(qtargs.qtutils, 'version_check',
- lambda version, compiled=False: new_version)
+ lambda version, compiled=False, exact=False:
+ new_version)
parsed = parser.parse_args([])
args = qtargs.qt_args(parsed)