Merge branch 'master' into more-sophisticated-adblock

3 files changed, 6 insertions, 27 deletions

diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 2183ac1d1..3c0623dfb 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -45,7 +45,7 @@ import helpers.stubs as stubsmod
 from qutebrowser.config import (config, configdata, configtypes, configexc,
                                 configfiles, configcache, stylesheet)
 from qutebrowser.api import config as configapi
-from qutebrowser.utils import objreg, standarddir, utils, usertypes, qtutils
+from qutebrowser.utils import objreg, standarddir, utils, usertypes
 from qutebrowser.browser import greasemonkey, history, qutescheme
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.misc import savemanager, sql, objects, sessions
@@ -258,11 +258,7 @@ def webengine_tab(web_tab_setup, qtbot, redirect_webengine_data,
     # If we wait for the GC to clean things up, there's a segfault inside
     # QtWebEngine sometimes (e.g. if we only run
     # tests/unit/browser/test_caret.py).
-    # However, with Qt < 5.12, doing this here will lead to an immediate
-    # segfault...
-    monkeypatch.undo()  # version_check could be patched
-    if qtutils.version_check('5.12'):
-        sip.delete(tab._widget)
+    sip.delete(tab._widget)
 
 
 @pytest.fixture(params=['webkit', 'webengine'])
diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py
index f9223c3ca..725df8fe8 100644
--- a/tests/helpers/stubs.py
+++ b/tests/helpers/stubs.py
@@ -670,8 +670,8 @@ class FakeWebEngineProfile:
 
 class FakeCookieStore:
 
-    def __init__(self, has_cookie_filter):
+    def __init__(self):
         self.cookie_filter = None
-        if has_cookie_filter:
-            self.setCookieFilter = (
-                lambda func: setattr(self, 'cookie_filter', func))  # noqa
+
+    def setCookieFilter(self, func):
+        self.cookie_filter = func
diff --git a/tests/helpers/utils.py b/tests/helpers/utils.py
index a437e047c..5f7297719 100644
--- a/tests/helpers/utils.py
+++ b/tests/helpers/utils.py
@@ -41,16 +41,8 @@ from qutebrowser.utils import qtutils, log
 
 ON_CI = 'CI' in os.environ
 
-qt58 = pytest.mark.skipif(
-    qtutils.version_check('5.9'), reason="Needs Qt 5.8 or earlier")
-qt59 = pytest.mark.skipif(
-    not qtutils.version_check('5.9'), reason="Needs Qt 5.9 or newer")
-qt510 = pytest.mark.skipif(
-    not qtutils.version_check('5.10'), reason="Needs Qt 5.10 or newer")
 qt514 = pytest.mark.skipif(
     not qtutils.version_check('5.14'), reason="Needs Qt 5.14 or newer")
-skip_qt511 = pytest.mark.skipif(
-    qtutils.version_check('5.11'), reason="Needs Qt 5.10 or earlier")
 
 
 class PartialCompareOutcome:
@@ -273,15 +265,6 @@ def seccomp_args(qt_flag):
     """
     affected_versions = set()
     for base, patch_range in [
-            ## seccomp-bpf failure in syscall 0281
-            ## https://github.com/qutebrowser/qutebrowser/issues/3163
-            # 5.7.1
-            ('5.7', [1]),
-
-            ## seccomp-bpf failure in syscall 0281 (clock_nanosleep)
-            ## https://bugreports.qt.io/browse/QTBUG-81313
-            # 5.11.0 to 5.11.3 (inclusive)
-            ('5.11', range(0, 4)),
             # 5.12.0 to 5.12.7 (inclusive)
             ('5.12', range(0, 8)),
             # 5.13.0 to 5.13.2 (inclusive)