diff options
author | Florian Bruhin <me@the-compiler.org> | 2018-09-13 22:49:25 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2018-09-13 22:49:25 +0200 |
commit | afe16d3a7cbe437c59aba130ced5607dcc09474f (patch) | |
tree | 22f773fcf3955102a37731fec166f57f0cd348be /tests/conftest.py | |
parent | 68af23b76efe31784df1529299900b28e544ead9 (diff) | |
download | qutebrowser-afe16d3a7cbe437c59aba130ced5607dcc09474f.tar.gz qutebrowser-afe16d3a7cbe437c59aba130ced5607dcc09474f.zip |
Avoid using qapp with autouse=True
Diffstat (limited to 'tests/conftest.py')
-rw-r--r-- | tests/conftest.py | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 0169ff3d2..05564f370 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -24,7 +24,6 @@ import os import sys import warnings -import mimetypes import pytest import hypothesis @@ -36,7 +35,6 @@ from helpers import logfail from helpers.logfail import fail_on_logging from helpers.messagemock import message_mock from helpers.fixtures import * # noqa: F403 -from qutebrowser.browser import qutescheme from qutebrowser.utils import qtutils, standarddir, usertypes, utils, version from qutebrowser.misc import objects from qutebrowser.qt import sip @@ -287,26 +285,3 @@ def pytest_runtest_makereport(item, call): outcome = yield rep = outcome.get_result() setattr(item, "rep_" + rep.when, rep) - - -@pytest.fixture(scope='session', autouse=True) -def register_testdata_scheme_handler(qapp, request): - try: - global _qute_scheme_handler - from qutebrowser.browser.webengine import webenginequtescheme - from PyQt5.QtWebEngineWidgets import QWebEngineProfile - _qute_scheme_handler = webenginequtescheme.QuteSchemeHandler(parent=qapp) - _qute_scheme_handler.install(QWebEngineProfile.defaultProfile()) - except ImportError: - pass - - @qutescheme.add_handler('testdata') - def handler(url): - file_abs = os.path.abspath(os.path.dirname(__file__)) - filename = os.path.join(file_abs, 'end2end', - url.path().lstrip('/')) - with open(filename, 'rb') as f: - data = f.read() - - mimetype, _encoding = mimetypes.guess_type(filename) - return mimetype, data |