Rename utils.py to testutils.py

21 files changed, 43 insertions, 43 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 16cd39656..ea7381a2f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -36,7 +36,7 @@ from helpers import logfail
 from helpers.logfail import fail_on_logging
 from helpers.messagemock import message_mock
 from helpers.fixtures import *  # noqa: F403
-from helpers import utils as testutils
+from helpers import testutils
 from qutebrowser.utils import qtutils, standarddir, usertypes, utils, version
 from qutebrowser.misc import objects, earlyinit
 from qutebrowser.qt import sip
diff --git a/tests/end2end/features/conftest.py b/tests/end2end/features/conftest.py
index 2862cc5d6..a65c8b507 100644
--- a/tests/end2end/features/conftest.py
+++ b/tests/end2end/features/conftest.py
@@ -37,7 +37,7 @@ import pytest_bdd as bdd
 import qutebrowser
 from qutebrowser.utils import log, utils, docutils
 from qutebrowser.browser import pdfjs
-from helpers import utils as testutils
+from helpers import testutils
 
 
 def _get_echo_exe_path():
diff --git a/tests/end2end/features/test_urlmarks_bdd.py b/tests/end2end/features/test_urlmarks_bdd.py
index 2d4dcb5b5..8aea592c3 100644
--- a/tests/end2end/features/test_urlmarks_bdd.py
+++ b/tests/end2end/features/test_urlmarks_bdd.py
@@ -21,7 +21,7 @@ import os.path
 
 import pytest_bdd as bdd
 
-from helpers import utils
+from helpers import testutils
 
 bdd.scenarios('urlmarks.feature')
 
@@ -48,7 +48,7 @@ def _check_marks(quteproc, quickmarks, expected, contains):
         lines = f.readlines()
 
     matched_line = any(
-        utils.pattern_match(pattern=expected, value=line.rstrip('\n'))
+        testutils.pattern_match(pattern=expected, value=line.rstrip('\n'))
         for line in lines)
 
     assert matched_line == contains, lines
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index d5a55d64b..9ef338768 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -38,7 +38,7 @@ from PyQt5.QtGui import QImage, QColor
 
 from qutebrowser.misc import ipc
 from qutebrowser.utils import log, utils, javascript
-from helpers import utils as testutils
+from helpers import testutils
 from end2end.fixtures import testprocess
 
 
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 75bab0bf3..33b154e9a 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -30,7 +30,7 @@ from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QProcess, QObject,
                           QElapsedTimer, QProcessEnvironment)
 from PyQt5.QtTest import QSignalSpy
 
-from helpers import utils
+from helpers import testutils
 
 from qutebrowser.utils import utils as quteutils
 
@@ -77,13 +77,13 @@ def _render_log(data, *, verbose, threshold=100):
     if (len(data) > threshold and
             not verbose and
             not is_exception and
-            not utils.ON_CI):
+            not testutils.ON_CI):
         msg = '[{} lines suppressed, use -v to show]'.format(
             len(data) - threshold)
         data = [msg] + data[-threshold:]
 
-    if utils.ON_CI:
-        data = [utils.gha_group_begin('Log')] + data + [utils.gha_group_end()]
+    if testutils.ON_CI:
+        data = [testutils.gha_group_begin('Log')] + data + [testutils.gha_group_end()]
 
     return '\n'.join(data)
 
@@ -233,7 +233,7 @@ class Process(QObject):
         self._started = True
         verbose = self.request.config.getoption('--verbose')
 
-        timeout = 60 if utils.ON_CI else 20
+        timeout = 60 if testutils.ON_CI else 20
         for _ in range(timeout):
             with self._wait_signal(self.ready, timeout=1000,
                                    raising=False) as blocker:
@@ -350,7 +350,7 @@ class Process(QObject):
         elif isinstance(expected, regex_type):
             return expected.search(value)
         elif isinstance(value, (bytes, str)):
-            return utils.pattern_match(pattern=expected, value=value)
+            return testutils.pattern_match(pattern=expected, value=value)
         else:
             return value == expected
 
@@ -475,7 +475,7 @@ class Process(QObject):
         if timeout is None:
             if do_skip:
                 timeout = 2000
-            elif utils.ON_CI:
+            elif testutils.ON_CI:
                 timeout = 15000
             else:
                 timeout = 5000
diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py
index 8a9f895a2..3efbfc14e 100644
--- a/tests/end2end/test_dirbrowser.py
+++ b/tests/end2end/test_dirbrowser.py
@@ -30,7 +30,7 @@ import bs4
 from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import urlutils
-from helpers import utils as testutils
+from helpers import testutils
 
 
 pytestmark = pytest.mark.qtwebengine_skip("Title is empty when parsing for "
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index 2c4e781b6..f3d74d1f0 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -30,7 +30,7 @@ import json
 import pytest
 from PyQt5.QtCore import QProcess, QPoint
 
-from helpers import utils as testutils
+from helpers import testutils
 from qutebrowser.utils import qtutils, utils
 
 
diff --git a/tests/helpers/test_helper_utils.py b/tests/helpers/test_helper_utils.py
index 2f4822df9..5d723429b 100644
--- a/tests/helpers/test_helper_utils.py
+++ b/tests/helpers/test_helper_utils.py
@@ -20,7 +20,7 @@
 
 import pytest
 
-from helpers import utils
+from helpers import testutils
 
 
 @pytest.mark.parametrize('val1, val2', [
@@ -32,7 +32,7 @@ from helpers import utils
     ("foobarbaz", "foo*baz"),
 ])
 def test_partial_compare_equal(val1, val2):
-    assert utils.partial_compare(val1, val2)
+    assert testutils.partial_compare(val1, val2)
 
 
 @pytest.mark.parametrize('val1, val2, error', [
@@ -48,9 +48,9 @@ def test_partial_compare_equal(val1, val2):
     (23.42, 13.37, "23.42 != 13.37 (float comparison)"),
 ])
 def test_partial_compare_not_equal(val1, val2, error):
-    outcome = utils.partial_compare(val1, val2)
+    outcome = testutils.partial_compare(val1, val2)
     assert not outcome
-    assert isinstance(outcome, utils.PartialCompareOutcome)
+    assert isinstance(outcome, testutils.PartialCompareOutcome)
     assert outcome.error == error
 
 
@@ -72,9 +72,9 @@ def test_partial_compare_not_equal(val1, val2, error):
     ('foo?ar', 'foo?ar', True),
 ])
 def test_pattern_match(pattern, value, expected):
-    assert utils.pattern_match(pattern=pattern, value=value) == expected
+    assert testutils.pattern_match(pattern=pattern, value=value) == expected
 
 
 def test_nop_contextmanager():
-    with utils.nop_contextmanager():
+    with testutils.nop_contextmanager():
         pass
diff --git a/tests/helpers/utils.py b/tests/helpers/testutils.py
index 8bb622133..8bb622133 100644
--- a/tests/helpers/utils.py
+++ b/tests/helpers/testutils.py
diff --git a/tests/unit/browser/webengine/test_darkmode.py b/tests/unit/browser/webengine/test_darkmode.py
index 3f4a9bca3..3f5272dab 100644
--- a/tests/unit/browser/webengine/test_darkmode.py
+++ b/tests/unit/browser/webengine/test_darkmode.py
@@ -24,7 +24,7 @@ from qutebrowser.config import configdata
 from qutebrowser.utils import usertypes, version, utils
 from qutebrowser.browser.webengine import darkmode
 from qutebrowser.misc import objects
-from helpers import utils as testutils
+from helpers import testutils
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py
index 51ab4472c..12cacb5a2 100644
--- a/tests/unit/browser/webkit/network/test_filescheme.py
+++ b/tests/unit/browser/webkit/network/test_filescheme.py
@@ -29,7 +29,7 @@ from PyQt5.QtNetwork import QNetworkRequest
 
 from qutebrowser.browser.webkit.network import filescheme
 from qutebrowser.utils import urlutils, utils
-from helpers import utils as testutils
+from helpers import testutils
 
 
 @pytest.mark.parametrize('create_file, create_dir, filterfunc, expected', [
diff --git a/tests/unit/components/test_braveadblock.py b/tests/unit/components/test_braveadblock.py
index 0afb7499e..3b99fbd38 100644
--- a/tests/unit/components/test_braveadblock.py
+++ b/tests/unit/components/test_braveadblock.py
@@ -30,7 +30,7 @@ import pytest
 from qutebrowser.api.interceptor import ResourceType
 from qutebrowser.components import braveadblock
 from qutebrowser.components.utils import blockutils
-from helpers import utils
+from helpers import testutils
 
 pytestmark = pytest.mark.usefixtures("qapp")
 
@@ -107,7 +107,7 @@ def run_function_on_dataset(given_function):
     contains tuples of (url, source_url, type) in each line. We give these
     to values to the given function, row by row.
     """
-    dataset = utils.adblock_dataset_tsv()
+    dataset = testutils.adblock_dataset_tsv()
     reader = csv.DictReader(dataset, delimiter="\t")
     for row in reader:
         url = QUrl(row["url"])
@@ -144,8 +144,8 @@ def easylist_easyprivacy_both(tmpdir):
     bl_dst_dir.mkdir()
     urls = []
     for blocklist, filename in [
-        (utils.easylist_txt(), "easylist.txt"),
-        (utils.easyprivacy_txt(), "easyprivacy.txt"),
+        (testutils.easylist_txt(), "easylist.txt"),
+        (testutils.easyprivacy_txt(), "easyprivacy.txt"),
     ]:
         bl_dst_path = bl_dst_dir / filename
         with open(bl_dst_path, "w", encoding="utf-8") as f:
diff --git a/tests/unit/components/test_hostblock.py b/tests/unit/components/test_hostblock.py
index 3869aba66..876be1c53 100644
--- a/tests/unit/components/test_hostblock.py
+++ b/tests/unit/components/test_hostblock.py
@@ -29,7 +29,7 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.components import hostblock
 from qutebrowser.utils import urlmatch
-from helpers import utils
+from helpers import testutils
 
 
 pytestmark = pytest.mark.usefixtures("qapp")
@@ -557,7 +557,7 @@ def test_add_directory(config_stub, tmpdir, host_blocker_factory):
 
 def test_adblock_benchmark(data_tmpdir, benchmark, host_blocker_factory):
     blocked_hosts = data_tmpdir / "blocked-hosts"
-    blocked_hosts.write_text("\n".join(utils.blocked_hosts()), encoding="utf-8")
+    blocked_hosts.write_text("\n".join(testutils.blocked_hosts()), encoding="utf-8")
 
     url = QUrl("https://www.example.org/")
     blocker = host_blocker_factory()
diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py
index 493cf0ace..1a0a9cb43 100644
--- a/tests/unit/config/test_configtypes.py
+++ b/tests/unit/config/test_configtypes.py
@@ -39,7 +39,7 @@ from qutebrowser.config import configtypes, configexc
 from qutebrowser.utils import debug, utils, qtutils, urlmatch, usertypes
 from qutebrowser.browser.network import pac
 from qutebrowser.keyinput import keyutils
-from helpers import utils as testutils
+from helpers import testutils
 
 
 class Font(QFont):
diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py
index f7cefec31..4a14df5ff 100644
--- a/tests/unit/config/test_configutils.py
+++ b/tests/unit/config/test_configutils.py
@@ -25,7 +25,7 @@ from PyQt5.QtWidgets import QLabel
 
 from qutebrowser.config import configutils, configdata, configtypes, configexc
 from qutebrowser.utils import urlmatch, usertypes, qtutils
-from tests.helpers import utils
+from tests.helpers import testutils
 
 
 @pytest.fixture
@@ -277,7 +277,7 @@ def test_no_pattern_support(func, opt, pattern):
 
 
 def test_add_url_benchmark(values, benchmark):
-    blocked_hosts = list(utils.blocked_hosts())
+    blocked_hosts = list(testutils.blocked_hosts())
 
     def _add_blocked():
         for line in blocked_hosts:
@@ -294,7 +294,7 @@ def test_add_url_benchmark(values, benchmark):
 def test_domain_lookup_sparse_benchmark(url, values, benchmark):
     url = QUrl(url)
     values.add(False, urlmatch.UrlPattern("*.foo.bar.baz"))
-    for line in utils.blocked_hosts():
+    for line in testutils.blocked_hosts():
         values.add(False, urlmatch.UrlPattern(line))
 
     benchmark(lambda: values.get_for_url(url))
diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py
index 55acb4bb1..e7dbd5d95 100644
--- a/tests/unit/config/test_qtargs.py
+++ b/tests/unit/config/test_qtargs.py
@@ -25,7 +25,7 @@ import pytest
 from qutebrowser import qutebrowser
 from qutebrowser.config import qtargs
 from qutebrowser.utils import usertypes, version
-from helpers import utils
+from helpers import testutils
 
 
 @pytest.fixture
@@ -356,7 +356,7 @@ class TestWebEngineArgs:
         ("auto", "5.15.3", False),
         ("auto", "6.0.0", False),
     ])
-    @utils.qt514
+    @testutils.qt514
     def test_preferred_color_scheme(
             self, config_stub, version_patcher, parser, value, qt_version, added):
         version_patcher(qt_version)
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py
index 1ea70afe7..ef500f9e5 100644
--- a/tests/unit/misc/test_ipc.py
+++ b/tests/unit/misc/test_ipc.py
@@ -37,7 +37,7 @@ from PyQt5.QtTest import QSignalSpy
 import qutebrowser
 from qutebrowser.misc import ipc
 from qutebrowser.utils import standarddir, utils
-from helpers import stubs, utils as testutils
+from helpers import stubs, testutils
 
 
 pytestmark = pytest.mark.usefixtures('qapp')
diff --git a/tests/unit/misc/test_throttle.py b/tests/unit/misc/test_throttle.py
index 48148a6a6..33e9949f2 100644
--- a/tests/unit/misc/test_throttle.py
+++ b/tests/unit/misc/test_throttle.py
@@ -25,11 +25,11 @@ import sip
 import pytest
 from PyQt5.QtCore import QObject
 
-from helpers import utils
+from helpers import testutils
 from qutebrowser.misc import throttle
 
 
-DELAY = 500 if utils.ON_CI else 100
+DELAY = 500 if testutils.ON_CI else 100
 
 
 @pytest.fixture
diff --git a/tests/unit/misc/userscripts/test_qute_lastpass.py b/tests/unit/misc/userscripts/test_qute_lastpass.py
index 7e2c7dfbd..3846028ee 100644
--- a/tests/unit/misc/userscripts/test_qute_lastpass.py
+++ b/tests/unit/misc/userscripts/test_qute_lastpass.py
@@ -26,9 +26,9 @@ from unittest.mock import ANY, call
 
 import pytest
 
-from helpers import utils
+from helpers import testutils
 
-qute_lastpass = utils.import_userscript('qute-lastpass')
+qute_lastpass = testutils.import_userscript('qute-lastpass')
 
 default_lpass_match = [
     {
diff --git a/tests/unit/scripts/test_run_vulture.py b/tests/unit/scripts/test_run_vulture.py
index f1e5a261a..0ef5afcee 100644
--- a/tests/unit/scripts/test_run_vulture.py
+++ b/tests/unit/scripts/test_run_vulture.py
@@ -23,7 +23,7 @@ import textwrap
 
 import pytest
 
-from tests.helpers import utils
+from tests.helpers import testutils
 
 try:
     from scripts.dev import run_vulture
@@ -53,7 +53,7 @@ class VultureDir:
         """Run vulture over all generated files and return the output."""
         names = [p.name for p in self._tmp_path.glob('*')]
         assert names
-        with utils.change_cwd(self._tmp_path):
+        with testutils.change_cwd(self._tmp_path):
             return run_vulture.run(names)
 
     def makepyfile(self, **kwargs):
@@ -86,7 +86,7 @@ def test_unused_func(vultdir):
     msg = "*test_unused_func*foo.py:2: unused function 'foo' (60% confidence)"
     msgs = vultdir.run()
     assert len(msgs) == 1
-    assert utils.pattern_match(pattern=msg, value=msgs[0])
+    assert testutils.pattern_match(pattern=msg, value=msgs[0])
 
 
 def test_unused_method_camelcase(vultdir):
diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py
index 076766814..c686e4f74 100644
--- a/tests/unit/utils/test_qtutils.py
+++ b/tests/unit/utils/test_qtutils.py
@@ -34,7 +34,7 @@ from PyQt5.QtGui import QColor
 
 from qutebrowser.utils import qtutils, utils, usertypes
 import overflow_test_cases
-from helpers import utils as testutils
+from helpers import testutils
 
 if utils.is_linux:
     # Those are not run on macOS because that seems to cause a hang sometimes.