tests: Use fixture for webengine_versions

Better solution for 58220286a91af38d4a83ddd3f02c1075e5375ffe

2 files changed, 16 insertions, 9 deletions

diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index a5ebf7f85..00ab1c3cf 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -30,7 +30,7 @@ import pytest
 from PyQt5.QtCore import QProcess, QPoint
 
 from helpers import utils
-from qutebrowser.utils import version, qtutils
+from qutebrowser.utils import qtutils
 
 
 ascii_locale = pytest.mark.skipif(sys.hexversion >= 0x03070000,
@@ -628,10 +628,8 @@ def test_cookies_store(quteproc_new, request, short_tmpdir, store):
     ('yellow', 'lightness-hsl', {None: utils.Color(204, 204, 0)}),
     ('yellow', 'brightness-rgb', {None: utils.Color(0, 0, 204)}),
 ])
-def test_dark_mode(testdata_scheme, quteproc_new, request, algorithm, filename, colors):
-    if not request.config.webengine:
-        pytest.skip("QtWebEngine only")
-
+def test_dark_mode(webengine_versions, quteproc_new, request,
+                   filename, algorithm, colors):
     args = _base_args(request.config) + [
         '--temp-basedir',
         '-s', 'colors.webpage.darkmode.enabled', 'true',
@@ -639,9 +637,7 @@ def test_dark_mode(testdata_scheme, quteproc_new, request, algorithm, filename,
     ]
     quteproc_new.start(args)
 
-    # Calling qtwebengine_versions() initializes QtWebEngine, so we depend on
-    # testdata_scheme here, to make sure that happens before.
-    ver = version.qtwebengine_versions().webengine
+    ver = webengine_versions.webengine
     minor_version = f'{ver.majorVersion()}.{ver.minorVersion()}'
     expected = colors.get(minor_version, colors[None])
 
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 547e11dba..e145255c8 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
+from qutebrowser.utils import objreg, standarddir, utils, usertypes, version
 from qutebrowser.browser import greasemonkey, history, qutescheme
 from qutebrowser.browser.webkit import cookies, cache
 from qutebrowser.misc import savemanager, sql, objects, sessions
@@ -725,3 +725,14 @@ def unwritable_tmp_path(tmp_path):
 
     # Make sure pytest can clean up the tmp_path
     tmp_path.chmod(0o755)
+
+
+@pytest.fixture
+def webengine_versions(testdata_scheme):
+    """Get QtWebEngine version numbers.
+
+    Calling qtwebengine_versions() initializes QtWebEngine, so we depend on
+    testdata_scheme here, to make sure that happens before.
+    """
+    pytest.importorskip('PyQt5.QtWebEngineWidgets')
+    return version.qtwebengine_versions()