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

tests: Fix QtWebEngine focus checking

Browse Source
This commit is contained in:
Florian Bruhin 2017-02-01 12:33:47 +01:00
parent 428e495935
commit e5176e18bd
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,13 +196,17 @@ class QuteProc(testprocess.Process):
start_okay_message_load = ( start_okay_message_load = (
"load status for <qutebrowser.browser.* tab_id=0 " "load status for <qutebrowser.browser.* tab_id=0 "
"url='about:blank'>: LoadStatus.success") "url='about:blank'>: LoadStatus.success")
start_okay_message_focus = ( start_okay_messages_focus = [
# QtWebKit
"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 # QtWebEngine
start_okay_message_focus_qtwe = ( "Focus object changed: "
"Focus object changed: <PyQt5.QtWidgets.QOpenGLWidget object at *>" "<PyQt5.QtWidgets.QOpenGLWidget object at *>",
) # QtWebEngine with Qt >= 5.8
"Focus object changed: "
"<PyQt5.QtGui.QWindow 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 ")):
@ -213,13 +217,8 @@ class QuteProc(testprocess.Process):
if not self._load_ready: if not self._load_ready:
log_line.waited_for = True log_line.waited_for = True
self._is_ready('load') self._is_ready('load')
elif (log_line.category == 'misc' and elif log_line.category == 'misc' and any(testutils.pattern_match(
testutils.pattern_match(pattern=start_okay_message_focus, pattern=pattern, value=log_line.message) for pattern in start_okay_messages_focus):
value=log_line.message)):
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') 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