diff options
author | toofar <toofar@spalge.com> | 2022-06-20 16:00:14 +1200 |
---|---|---|
committer | toofar <toofar@spalge.com> | 2022-07-03 16:51:04 +1200 |
commit | ce79b64a6ef35b6393a536d97cc8920dfcb57a8c (patch) | |
tree | 21cef46521fe75eb3f2158ae5eed4360cc0dd760 | |
parent | f0ef68968cb0412e19337e7d167aa4398637e211 (diff) | |
download | qutebrowser-ce79b64a6ef35b6393a536d97cc8920dfcb57a8c.tar.gz qutebrowser-ce79b64a6ef35b6393a536d97cc8920dfcb57a8c.zip |
Adapt e2e tests to importorskip change
Make the module be passed as attributes for qutebrowser.qt, not full modules
names.
Remove redundant importlib call, the skipping methods should already do this.
Add lowlevel log line ignore (software rendering on AMD).
-rw-r--r-- | tests/end2end/fixtures/quteprocess.py | 1 | ||||
-rw-r--r-- | tests/end2end/test_invocations.py | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index c4b277015..234113b86 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -56,6 +56,7 @@ def is_ignored_lowlevel_message(message): # Qt 6.2 / 6.3 'Fontconfig error: Cannot load default config file: No such file: (null)', 'Fontconfig error: Cannot load default config file', + 'WARNING: lavapipe is not a conformant vulkan implementation, testing use only.', ] return any(testutils.pattern_match(pattern=pattern, value=message) for pattern in ignored_messages) diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py index f53ed3129..91bb45303 100644 --- a/tests/end2end/test_invocations.py +++ b/tests/end2end/test_invocations.py @@ -802,25 +802,16 @@ 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 = "qutebrowser.qt.webenginewidgets" - qtwk_module = "qutebrowser.qt.webkitwidgets" + qtwe_module = "webenginewidgets" + qtwk_module = "webkitwidgets" # Note we want to try the *opposite* backend here. if request.config.webengine: testutils.qt_module_skip(qtwe_module) - module = qtwk_module backend = 'webkit' else: testutils.qt_module_skip(qtwk_module) - module = qtwe_module backend = 'webengine' - try: - importlib.import_module(module) - except ImportError: - pass - else: - pytest.skip(f"{module} is available") - args = [ '--debug', '--json-logging', '--no-err-windows', '--backend', backend, |