rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add --qute-bdd-webengine switch for end2end tests

Browse Source
This commit is contained in:
Florian Bruhin 2016-07-11 17:24:03 +02:00
parent ed5af29ac9
commit d91c922b4c
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/conftest.py
View File

@ -145,6 +145,8 @@ def pytest_addoption(parser):
help="Delay between qutebrowser commands.") help="Delay between qutebrowser commands.")
parser.addoption('--qute-profile-subprocs', action='store_true', parser.addoption('--qute-profile-subprocs', action='store_true',
default=False, help="Run cProfile for subprocesses.") default=False, help="Run cProfile for subprocesses.")
parser.addoption('--qute-bdd-webengine', action='store_true',
help='Use QtWebEngine for BDD tests')
@pytest.fixture(scope='session', autouse=True) @pytest.fixture(scope='session', autouse=True)

25
tests/end2end/fixtures/quteprocess.py
View File

@ -142,6 +142,7 @@ class QuteProc(testprocess.Process):
_delay: Delay to wait between commands. _delay: Delay to wait between commands.
_ipc_socket: The IPC socket of the started instance. _ipc_socket: The IPC socket of the started instance.
_httpbin: The HTTPBin webserver. _httpbin: The HTTPBin webserver.
_webengine: Whether to use QtWebEngine
basedir: The base directory for this instance. basedir: The base directory for this instance.
_focus_ready: Whether the main window got focused. _focus_ready: Whether the main window got focused.
_load_ready: Whether the about:blank page got loaded. _load_ready: Whether the about:blank page got loaded.
@ -159,9 +160,10 @@ class QuteProc(testprocess.Process):
KEYS = ['timestamp', 'loglevel', 'category', 'module', 'function', 'line', KEYS = ['timestamp', 'loglevel', 'category', 'module', 'function', 'line',
'message'] 'message']
def __init__(self, httpbin, delay, *, profile=False, config=None, def __init__(self, httpbin, delay, *, webengine=False, profile=False,
parent=None): config=None, parent=None):
super().__init__(parent) super().__init__(parent)
self._webengine = webengine
self._profile = profile self._profile = profile
self._delay = delay self._delay = delay
self._httpbin = httpbin self._httpbin = httpbin
@ -207,6 +209,10 @@ class QuteProc(testprocess.Process):
start_okay_message_focus = ( start_okay_message_focus = (
"Focus object changed: " "Focus object changed: "
"<qutebrowser.browser.* tab_id=0 url='about:blank'>") "<qutebrowser.browser.* tab_id=0 url='about:blank'>")
# With QtWebEngine the QOpenGLWidget has the actual focus
start_okay_message_focus_qtwe = (
"Focus object changed: <PyQt5.QtWidgets.QOpenGLWidget object at *>"
)
if (log_line.category == 'ipc' and if (log_line.category == 'ipc' and
log_line.message.startswith("Listening as ")): log_line.message.startswith("Listening as ")):
@ -219,6 +225,10 @@ class QuteProc(testprocess.Process):
testutils.pattern_match(pattern=start_okay_message_focus, testutils.pattern_match(pattern=start_okay_message_focus,
value=log_line.message)): value=log_line.message)):
self._is_ready('focus') self._is_ready('focus')
elif (log_line.category == 'misc' and
testutils.pattern_match(pattern=start_okay_message_focus_qtwe,
value=log_line.message)):
self._is_ready('focus')
elif (log_line.category == 'init' and elif (log_line.category == 'init' and
log_line.module == 'standarddir' and log_line.module == 'standarddir' and
log_line.function == 'init' and log_line.function == 'init' and
@ -256,8 +266,9 @@ class QuteProc(testprocess.Process):
return executable, args return executable, args
def _default_args(self): def _default_args(self):
backend = 'webengine' if self._webengine else 'webkit'
return ['--debug', '--no-err-windows', '--temp-basedir', return ['--debug', '--no-err-windows', '--temp-basedir',
'--json-logging', 'about:blank'] '--json-logging', '--backend', backend, 'about:blank']
def path_to_url(self, path, *, port=None, https=False): def path_to_url(self, path, *, port=None, https=False):
"""Get a URL based on a filename for the localhost webserver. """Get a URL based on a filename for the localhost webserver.
@ -571,7 +582,9 @@ def quteproc_process(qapp, httpbin, request):
"""Fixture for qutebrowser process which is started once per file.""" """Fixture for qutebrowser process which is started once per file."""
delay = request.config.getoption('--qute-delay') delay = request.config.getoption('--qute-delay')
profile = request.config.getoption('--qute-profile-subprocs') profile = request.config.getoption('--qute-profile-subprocs')
proc = QuteProc(httpbin, delay, profile=profile, config=request.config) webengine = request.config.getoption('--qute-bdd-webengine')
proc = QuteProc(httpbin, delay, webengine=webengine, profile=profile,
config=request.config)
proc.start() proc.start()
yield proc yield proc
proc.terminate() proc.terminate()
@ -591,7 +604,9 @@ def quteproc_new(qapp, httpbin, request):
"""Per-test qutebrowser process to test invocations.""" """Per-test qutebrowser process to test invocations."""
delay = request.config.getoption('--qute-delay') delay = request.config.getoption('--qute-delay')
profile = request.config.getoption('--qute-profile-subprocs') profile = request.config.getoption('--qute-profile-subprocs')
proc = QuteProc(httpbin, delay, profile=profile, config=request.config) webengine = request.config.getoption('--qute-bdd-webengine')
proc = QuteProc(httpbin, delay, webengine=webengine, profile=profile,
config=request.config)
request.node._quteproc_log = proc.captured_log request.node._quteproc_log = proc.captured_log
# Not calling before_test here as that would start the process # Not calling before_test here as that would start the process
yield proc yield proc