summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy <jimmy@spalge.com>2022-04-17 11:12:23 +1200
committerJimmy <jimmy@spalge.com>2022-04-30 18:23:14 +1200
commitc88cdb78909d5a892725d8119a11de2e02c14518 (patch)
tree59ded09fbc5ba9d1d3935c6075c6401adc90e63a
parentff96b06f54bbab231a5b859b7ba5c405edfa69df (diff)
downloadqutebrowser-c88cdb78909d5a892725d8119a11de2e02c14518.tar.gz
qutebrowser-c88cdb78909d5a892725d8119a11de2e02c14518.zip
Update string PyQt5 references in tests
git grep -l "['\"]PyQt5" tests/ | xargs sed -i -e 's/"PyQt5/"qutebrowser.qt/' -e "s/'PyQt5/'qutebrowser.qt/"
-rw-r--r--tests/end2end/fixtures/quteprocess.py8
-rw-r--r--tests/end2end/test_invocations.py4
-rw-r--r--tests/helpers/fixtures.py8
-rw-r--r--tests/unit/browser/test_history.py4
-rw-r--r--tests/unit/browser/webengine/test_webengine_cookies.py2
-rw-r--r--tests/unit/browser/webengine/test_webenginedownloads.py2
-rw-r--r--tests/unit/browser/webengine/test_webengineinterceptor.py2
-rw-r--r--tests/unit/browser/webengine/test_webenginesettings.py2
-rw-r--r--tests/unit/browser/webengine/test_webenginetab.py2
-rw-r--r--tests/unit/browser/webkit/test_tabhistory.py2
-rw-r--r--tests/unit/browser/webkit/test_webkitelem.py2
-rw-r--r--tests/unit/browser/webkit/test_webkitsettings.py2
-rw-r--r--tests/unit/completion/test_models.py2
-rw-r--r--tests/unit/config/test_configfiles.py2
-rw-r--r--tests/unit/config/test_configinit.py2
-rw-r--r--tests/unit/config/test_qtargs.py2
-rw-r--r--tests/unit/config/test_qtargs_locale_workaround.py2
-rw-r--r--tests/unit/javascript/position_caret/test_position_caret.py4
-rw-r--r--tests/unit/javascript/stylesheet/test_stylesheet_js.py2
-rw-r--r--tests/unit/misc/test_elf.py2
-rw-r--r--tests/unit/misc/test_sessions.py2
-rw-r--r--tests/unit/utils/test_debug.py2
-rw-r--r--tests/unit/utils/test_utils.py2
-rw-r--r--tests/unit/utils/test_version.py4
24 files changed, 34 insertions, 34 deletions
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py
index 311bbbb4e..c80c4b5e3 100644
--- a/tests/end2end/fixtures/quteprocess.py
+++ b/tests/end2end/fixtures/quteprocess.py
@@ -597,11 +597,11 @@ class QuteProc(testprocess.Process):
raise ValueError("Either both x/y or neither must be given!")
if x is None and y is None:
- point = 'PyQt5.QtCore.QPoint(*, *)' # not counting 0/0 here
+ point = 'qutebrowser.qt.QtCore.QPoint(*, *)' # not counting 0/0 here
elif x == '0' and y == '0':
- point = 'PyQt5.QtCore.QPoint()'
+ point = 'qutebrowser.qt.QtCore.QPoint()'
else:
- point = 'PyQt5.QtCore.QPoint({}, {})'.format(x, y)
+ point = 'qutebrowser.qt.QtCore.QPoint({}, {})'.format(x, y)
self.wait_for(category='webview',
message='Scroll position changed to ' + point)
@@ -854,7 +854,7 @@ class QuteProc(testprocess.Process):
pattern = re.compile(
r"(load status for <qutebrowser\.browser\..* "
r"tab_id=\d+ url='{url}/?'>: LoadStatus\.{load_status}|fetch: "
- r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format(
+ r"qutebrowser.qt\.QtCore\.QUrl\('{url}'\) -> .*)".format(
load_status=re.escape(load_status), url=re.escape(url)))
try:
diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py
index baaff6e06..502decc0e 100644
--- a/tests/end2end/test_invocations.py
+++ b/tests/end2end/test_invocations.py
@@ -786,8 +786,8 @@ def test_unavailable_backend(request, quteproc_new):
that the chosen backend is actually available - i.e., that the error message is
properly printed, rather than an unhandled exception.
"""
- qtwe_module = "PyQt5.QtWebEngineWidgets"
- qtwk_module = "PyQt5.QtWebKitWidgets"
+ qtwe_module = "qutebrowser.qt.QtWebEngineWidgets"
+ qtwk_module = "qutebrowser.qt.QtWebKitWidgets"
# Note we want to try the *opposite* backend here.
if request.config.webengine:
testutils.importorskip_ifnull(qtwe_module)
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 8a78f5cea..0e9f1bbd3 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -438,7 +438,7 @@ def qnam(qapp):
@pytest.fixture
def webengineview(qtbot, monkeypatch, web_tab_setup):
"""Get a QWebEngineView if QtWebEngine is available."""
- QtWebEngineWidgets = testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+ QtWebEngineWidgets = testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebEngine)
view = QtWebEngineWidgets.QWebEngineView()
qtbot.add_widget(view)
@@ -449,7 +449,7 @@ def webengineview(qtbot, monkeypatch, web_tab_setup):
@pytest.fixture
def webpage(qnam, monkeypatch):
"""Get a new QWebPage object."""
- QtWebKitWidgets = testutils.importorskip_ifnull('PyQt5.QtWebKitWidgets')
+ QtWebKitWidgets = testutils.importorskip_ifnull('qutebrowser.qt.QtWebKitWidgets')
monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebKit)
class WebPageStub(QtWebKitWidgets.QWebPage):
@@ -474,7 +474,7 @@ def webpage(qnam, monkeypatch):
@pytest.fixture
def webview(qtbot, webpage):
"""Get a new QWebView object."""
- QtWebKitWidgets = testutils.importorskip_ifnull('PyQt5.QtWebKitWidgets')
+ QtWebKitWidgets = testutils.importorskip_ifnull('qutebrowser.qt.QtWebKitWidgets')
view = QtWebKitWidgets.QWebView()
qtbot.add_widget(view)
@@ -731,7 +731,7 @@ def webengine_versions(testdata_scheme):
Calling qtwebengine_versions() initializes QtWebEngine, so we depend on
testdata_scheme here, to make sure that happens before.
"""
- testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+ testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
return version.qtwebengine_versions()
diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py
index 5314672d8..bee26573a 100644
--- a/tests/unit/browser/test_history.py
+++ b/tests/unit/browser/test_history.py
@@ -277,7 +277,7 @@ class TestHistoryInterface:
@pytest.fixture
def hist_interface(self, web_history):
# pylint: disable=invalid-name
- QtWebKit = testutils.importorskip_ifnull('PyQt5.QtWebKit')
+ QtWebKit = testutils.importorskip_ifnull('qutebrowser.qt.QtWebKit')
from qutebrowser.browser.webkit import webkithistory
QWebHistoryInterface = QtWebKit.QWebHistoryInterface
# pylint: enable=invalid-name
@@ -311,7 +311,7 @@ class TestInit:
usertypes.Backend.QtWebKit])
def test_init(self, backend, qapp, tmpdir, data_tmpdir, monkeypatch, cleanup_init):
if backend == usertypes.Backend.QtWebKit:
- testutils.importorskip_ifnull('PyQt5.QtWebKitWidgets')
+ testutils.importorskip_ifnull('qutebrowser.qt.QtWebKitWidgets')
else:
assert backend == usertypes.Backend.QtWebEngine
diff --git a/tests/unit/browser/webengine/test_webengine_cookies.py b/tests/unit/browser/webengine/test_webengine_cookies.py
index deba1cdf5..773ca0e24 100644
--- a/tests/unit/browser/webengine/test_webengine_cookies.py
+++ b/tests/unit/browser/webengine/test_webengine_cookies.py
@@ -20,7 +20,7 @@
import pytest
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebEngineCore')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineCore')
from qutebrowser.browser.webengine import cookies
from qutebrowser.utils import urlmatch
diff --git a/tests/unit/browser/webengine/test_webenginedownloads.py b/tests/unit/browser/webengine/test_webenginedownloads.py
index 620de6ba8..206f5368e 100644
--- a/tests/unit/browser/webengine/test_webenginedownloads.py
+++ b/tests/unit/browser/webengine/test_webenginedownloads.py
@@ -24,7 +24,7 @@ import dataclasses
import pytest
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
from qutebrowser.qt import QtWebEngineWidgets
from qutebrowser.utils import urlutils, usertypes, utils
diff --git a/tests/unit/browser/webengine/test_webengineinterceptor.py b/tests/unit/browser/webengine/test_webengineinterceptor.py
index 48aa0a465..c57ce9590 100644
--- a/tests/unit/browser/webengine/test_webengineinterceptor.py
+++ b/tests/unit/browser/webengine/test_webengineinterceptor.py
@@ -21,7 +21,7 @@
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
from qutebrowser.qt import QtWebEngineCore
from qutebrowser.browser.webengine import interceptor
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index da3c47db2..d6ba29a34 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -22,7 +22,7 @@ import logging
import pytest
from helpers import testutils
-QtWebEngineWidgets = testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+QtWebEngineWidgets = testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
from qutebrowser.browser.webengine import webenginesettings
from qutebrowser.utils import usertypes
diff --git a/tests/unit/browser/webengine/test_webenginetab.py b/tests/unit/browser/webengine/test_webenginetab.py
index aa5182859..c37128f36 100644
--- a/tests/unit/browser/webengine/test_webenginetab.py
+++ b/tests/unit/browser/webengine/test_webenginetab.py
@@ -27,7 +27,7 @@ from qutebrowser.browser import greasemonkey
from qutebrowser.utils import usertypes
from helpers import testutils
-QtWebEngineWidgets = testutils.importorskip_ifnull("PyQt5.QtWebEngineWidgets")
+QtWebEngineWidgets = testutils.importorskip_ifnull("qutebrowser.qt.QtWebEngineWidgets")
QWebEnginePage = QtWebEngineWidgets.QWebEnginePage
QWebEngineScriptCollection = QtWebEngineWidgets.QWebEngineScriptCollection
QWebEngineScript = QtWebEngineWidgets.QWebEngineScript
diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py
index e362d3f34..c350a198d 100644
--- a/tests/unit/browser/webkit/test_tabhistory.py
+++ b/tests/unit/browser/webkit/test_tabhistory.py
@@ -24,7 +24,7 @@ from typing import Any
import pytest
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebKit')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebKit')
from qutebrowser.qt import QtWebKit
from qutebrowser.browser.webkit import tabhistory
diff --git a/tests/unit/browser/webkit/test_webkitelem.py b/tests/unit/browser/webkit/test_webkitelem.py
index 2d8619758..d8968e2d3 100644
--- a/tests/unit/browser/webkit/test_webkitelem.py
+++ b/tests/unit/browser/webkit/test_webkitelem.py
@@ -29,7 +29,7 @@ import dataclasses
import pytest
from helpers import testutils
-QWebElement = testutils.importorskip_ifnull('PyQt5.QtWebKit').QWebElement
+QWebElement = testutils.importorskip_ifnull('qutebrowser.qt.QtWebKit').QWebElement
from qutebrowser.browser import browsertab
from qutebrowser.browser.webkit import webkitelem
diff --git a/tests/unit/browser/webkit/test_webkitsettings.py b/tests/unit/browser/webkit/test_webkitsettings.py
index ea4527369..7b7c66372 100644
--- a/tests/unit/browser/webkit/test_webkitsettings.py
+++ b/tests/unit/browser/webkit/test_webkitsettings.py
@@ -19,7 +19,7 @@
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebKitWidgets')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebKitWidgets')
from qutebrowser.browser.webkit import webkitsettings
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 01295c7d9..ad360438d 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -1343,7 +1343,7 @@ def test_url_completion_benchmark(benchmark, info,
@pytest.fixture
def tab_with_history(fake_web_tab, tabbed_browser_stubs, info, monkeypatch):
"""Returns a fake tab with some fake history items."""
- testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+ testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
tab = fake_web_tab(QtCore.QUrl('https://github.com'), 'GitHub', 0)
current_idx = 2
monkeypatch.setattr(
diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py
index ed7cb1714..9aaacae74 100644
--- a/tests/unit/config/test_configfiles.py
+++ b/tests/unit/config/test_configfiles.py
@@ -221,7 +221,7 @@ def test_qtwe_version_changed(state_writer, qtwe_version_patcher,
def test_qtwe_version_changed_webkit(stubs, monkeypatch, state_writer):
- fake = stubs.ImportFake({'PyQt5.QtWebEngineWidgets': False}, monkeypatch)
+ fake = stubs.ImportFake({'qutebrowser.qt.QtWebEngineWidgets': False}, monkeypatch)
fake.patch()
state_writer('qtwe_version', 'no')
diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py
index 870c3826b..7ac4b11a6 100644
--- a/tests/unit/config/test_configinit.py
+++ b/tests/unit/config/test_configinit.py
@@ -427,7 +427,7 @@ def test_get_backend(monkeypatch, args, config_stub,
real_import = __import__
def fake_import(name, *args, **kwargs):
- if name != 'PyQt5.QtWebKit':
+ if name != 'qutebrowser.qt.QtWebKit':
return real_import(name, *args, **kwargs)
raise ImportError
diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py
index 60d29e430..83f975f6e 100644
--- a/tests/unit/config/test_qtargs.py
+++ b/tests/unit/config/test_qtargs.py
@@ -126,7 +126,7 @@ class TestWebEngineArgs:
@pytest.fixture(autouse=True)
def ensure_webengine(self, monkeypatch):
"""Skip all tests if QtWebEngine is unavailable."""
- testutils.importorskip_ifnull("PyQt5.QtWebEngine")
+ testutils.importorskip_ifnull("qutebrowser.qt.QtWebEngine")
monkeypatch.setattr(qtargs.objects, 'backend', usertypes.Backend.QtWebEngine)
@pytest.mark.parametrize('backend, qt_version, expected', [
diff --git a/tests/unit/config/test_qtargs_locale_workaround.py b/tests/unit/config/test_qtargs_locale_workaround.py
index 2a4d6c81c..ed512807b 100644
--- a/tests/unit/config/test_qtargs_locale_workaround.py
+++ b/tests/unit/config/test_qtargs_locale_workaround.py
@@ -27,7 +27,7 @@ from qutebrowser.config import qtargs
from helpers import testutils
-testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
@pytest.fixture(autouse=True)
diff --git a/tests/unit/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py
index aa92319a6..00b192ae4 100644
--- a/tests/unit/javascript/position_caret/test_position_caret.py
+++ b/tests/unit/javascript/position_caret/test_position_caret.py
@@ -23,8 +23,8 @@ import pytest
from helpers import testutils
-QWebSettings = testutils.importorskip_ifnull("PyQt5.QtWebKit").QWebSettings
-QWebPage = testutils.importorskip_ifnull("PyQt5.QtWebKitWidgets").QWebPage
+QWebSettings = testutils.importorskip_ifnull("qutebrowser.qt.QtWebKit").QWebSettings
+QWebPage = testutils.importorskip_ifnull("qutebrowser.qt.QtWebKitWidgets").QWebPage
@pytest.fixture(autouse=True)
diff --git a/tests/unit/javascript/stylesheet/test_stylesheet_js.py b/tests/unit/javascript/stylesheet/test_stylesheet_js.py
index 760bdced1..1043a0aad 100644
--- a/tests/unit/javascript/stylesheet/test_stylesheet_js.py
+++ b/tests/unit/javascript/stylesheet/test_stylesheet_js.py
@@ -25,7 +25,7 @@ import pytest
from qutebrowser.utils import javascript
from helpers import testutils
-QtWebEngineWidgets = testutils.importorskip_ifnull("PyQt5.QtWebEngineWidgets")
+QtWebEngineWidgets = testutils.importorskip_ifnull("qutebrowser.qt.QtWebEngineWidgets")
QWebEngineProfile = QtWebEngineWidgets.QWebEngineProfile
diff --git a/tests/unit/misc/test_elf.py b/tests/unit/misc/test_elf.py
index 47110db4f..2803c9ef4 100644
--- a/tests/unit/misc/test_elf.py
+++ b/tests/unit/misc/test_elf.py
@@ -58,7 +58,7 @@ def test_result(qapp, caplog):
If that happens, please report a bug about it!
"""
- testutils.importorskip_ifnull('PyQt5.QtWebEngineCore')
+ testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineCore')
versions = elf.parse_webenginecore()
assert versions is not None
diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py
index cc87de64d..7f83a713b 100644
--- a/tests/unit/misc/test_sessions.py
+++ b/tests/unit/misc/test_sessions.py
@@ -25,7 +25,7 @@ import pytest
import yaml
from helpers import testutils
-QWebView = testutils.importorskip_ifnull('PyQt5.QtWebKitWidgets').QWebView
+QWebView = testutils.importorskip_ifnull('qutebrowser.qt.QtWebKitWidgets').QWebView
from qutebrowser.misc import sessions
from qutebrowser.misc.sessions import TabHistoryItem as Item
diff --git a/tests/unit/utils/test_debug.py b/tests/unit/utils/test_debug.py
index f81cc29d4..4d4381f07 100644
--- a/tests/unit/utils/test_debug.py
+++ b/tests/unit/utils/test_debug.py
@@ -186,7 +186,7 @@ class TestQFlagsKey:
No idea what's happening here exactly...
"""
- qwebpage = testutils.importorskip_ifnull("PyQt5.QtWebKitWidgets").QWebPage
+ qwebpage = testutils.importorskip_ifnull("qutebrowser.qt.QtWebKitWidgets").QWebPage
flags = qwebpage.FindWrapsAroundDocument
flags |= qwebpage.FindBackward
diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
index c60758a3b..1738738a8 100644
--- a/tests/unit/utils/test_utils.py
+++ b/tests/unit/utils/test_utils.py
@@ -749,7 +749,7 @@ class TestOpenFile:
@pytest.fixture
def openurl_mock(self, mocker):
- return mocker.patch('PyQt5.QtGui.QDesktopServices.openUrl', spec={},
+ return mocker.patch('qutebrowser.qt.QtGui.QDesktopServices.openUrl', spec={},
new_callable=mocker.Mock)
def test_system_default_application(self, caplog, config_stub,
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 9ed7e3b39..4a40659b5 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -1060,7 +1060,7 @@ class TestChromiumVersion:
@pytest.fixture(autouse=True)
def clear_parsed_ua(self, monkeypatch):
- testutils.importorskip_ifnull('PyQt5.QtWebEngineWidgets')
+ testutils.importorskip_ifnull('qutebrowser.qt.QtWebEngineWidgets')
if webenginesettings is not None:
# Not available with QtWebKit
monkeypatch.setattr(webenginesettings, 'parsed_user_agent', None)
@@ -1342,7 +1342,7 @@ class TestOpenGLInfo:
def test_func(self, qapp):
"""Simply call version.opengl_info() and see if it doesn't crash."""
- testutils.importorskip_ifnull("PyQt5.QtOpenGL")
+ testutils.importorskip_ifnull("qutebrowser.qt.QtOpenGL")
version.opengl_info()
def test_func_fake(self, qapp, monkeypatch):