tests: Move freezer to fixtures.py

3 files changed, 12 insertions, 22 deletions

diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 4e0204741..89386a1a5 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -42,6 +42,7 @@ from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout
 from PyQt5.QtNetwork import QNetworkCookieJar
 
 import helpers.stubs as stubsmod
+import qutebrowser
 from qutebrowser.config import (config, configdata, configtypes, configexc,
                                 configfiles, configcache, stylesheet)
 from qutebrowser.api import config as configapi
@@ -736,3 +737,14 @@ def webengine_versions(testdata_scheme):
     """
     pytest.importorskip('PyQt5.QtWebEngineWidgets')
     return version.qtwebengine_versions()
+
+
+@pytest.fixture(params=[True, False])
+def freezer(request, monkeypatch):
+    if request.param and not getattr(sys, 'frozen', False):
+        monkeypatch.setattr(sys, 'frozen', True, raising=False)
+        monkeypatch.setattr(sys, 'executable', qutebrowser.__file__)
+    elif not request.param and getattr(sys, 'frozen', False):
+        # Want to test unfrozen tests, but we are frozen
+        pytest.skip("Can't run with sys.frozen = True!")
+    return request.param
diff --git a/tests/unit/utils/test_resources.py b/tests/unit/utils/test_resources.py
index d8af64cb9..738fadd37 100644
--- a/tests/unit/utils/test_resources.py
+++ b/tests/unit/utils/test_resources.py
@@ -19,24 +19,12 @@
 
 """Tests for qutebrowser.utils.resources."""
 
-import sys
 import os.path
 import zipfile
 import pytest
-import qutebrowser
 from qutebrowser.utils import utils, resources
 
 
-@pytest.fixture(params=[True, False])
-def freezer(request, monkeypatch):
-    if request.param and not getattr(sys, 'frozen', False):
-        monkeypatch.setattr(sys, 'frozen', True, raising=False)
-        monkeypatch.setattr(sys, 'executable', qutebrowser.__file__)
-    elif not request.param and getattr(sys, 'frozen', False):
-        # Want to test unfrozen tests, but we are frozen
-        pytest.skip("Can't run with sys.frozen = True!")
-
-
 @pytest.mark.usefixtures('freezer')
 class TestReadFile:
 
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index cd1db7c5f..a935c7607 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -217,16 +217,6 @@ class TestElidingFilenames:
         assert utils.elide_filename(filename, length) == expected
 
 
-@pytest.fixture(params=[True, False])
-def freezer(request, monkeypatch):
-    if request.param and not getattr(sys, 'frozen', False):
-        monkeypatch.setattr(sys, 'frozen', True, raising=False)
-        monkeypatch.setattr(sys, 'executable', qutebrowser.__file__)
-    elif not request.param and getattr(sys, 'frozen', False):
-        # Want to test unfrozen tests, but we are frozen
-        pytest.skip("Can't run with sys.frozen = True!")
-
-
 @pytest.mark.parametrize('seconds, out', [
     (-1, '-0:01'),
     (0, '0:00'),