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

bdd: Improve wait_for_load_finished output

Browse Source
This commit is contained in:
Florian Bruhin 2016-04-20 07:37:36 +02:00
parent 5e91ad6c42
commit a99cb5f6b2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/quteprocess.py
View File

@ -385,6 +385,8 @@ class QuteProc(testprocess.Process):
def wait_for_load_finished(self, path, *, port=None, https=False, def wait_for_load_finished(self, path, *, port=None, https=False,
timeout=None, load_status='success'): timeout=None, load_status='success'):
"""Wait until any tab has finished loading.""" """Wait until any tab has finished loading."""
__tracebackhide__ = True
if timeout is None: if timeout is None:
if 'CI' in os.environ: if 'CI' in os.environ:
timeout = 15000 timeout = 15000
@ -400,7 +402,12 @@ class QuteProc(testprocess.Process):
r"tab_id=\d+ url='{url}/?'>: LoadStatus\.{load_status}|fetch: " r"tab_id=\d+ url='{url}/?'>: LoadStatus\.{load_status}|fetch: "
r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format( r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format(
load_status=re.escape(load_status), url=re.escape(url))) load_status=re.escape(load_status), url=re.escape(url)))
try:
self.wait_for(message=pattern, timeout=timeout) self.wait_for(message=pattern, timeout=timeout)
except testprocess.WaitForTimeout:
raise testprocess.WaitForTimeout("Timed out while waiting for {} "
"to be loaded".format(url))
def get_session(self): def get_session(self):
"""Save the session and get the parsed session data.""" """Save the session and get the parsed session data."""