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

tests: Allow to open about:…/qute:… in QuteProc.

Browse Source
This commit is contained in:
Florian Bruhin 2015-11-12 21:52:03 +01:00
parent 200467c7f3
commit 25921792ef
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/quteprocess.py
View File

@ -177,6 +177,12 @@ class QuteProc(testprocess.Process):
'about:blank'] 'about:blank']
return executable, args return executable, args
def _path_to_url(self, path):
if path.startswith('about:') or path.startswith('qute:'):
return path
else:
return 'http://localhost:{}/{}'.format(self._httpbin.port, path)
def after_test(self): def after_test(self):
bad_msgs = [msg for msg in self._data bad_msgs = [msg for msg in self._data
if msg.loglevel > logging.INFO and not msg.expected] if msg.loglevel > logging.INFO and not msg.expected]
@ -199,7 +205,7 @@ class QuteProc(testprocess.Process):
self.wait_for(category='config', message='Config option changed: *') self.wait_for(category='config', message='Config option changed: *')
def open_path(self, path, new_tab=False): def open_path(self, path, new_tab=False):
url = 'http://localhost:{}/{}'.format(self._httpbin.port, path) url = self._path_to_url(path)
if new_tab: if new_tab:
self.send_cmd(':open -t ' + url) self.send_cmd(':open -t ' + url)
else: else:
@ -222,7 +228,7 @@ class QuteProc(testprocess.Process):
def wait_for_load_finished(self, path, timeout=15000): def wait_for_load_finished(self, path, timeout=15000):
"""Wait until any tab has finished loading.""" """Wait until any tab has finished loading."""
url = 'http://localhost:{}/{}'.format(self._httpbin.port, path) url = self._path_to_url(path)
pattern = re.compile( pattern = re.compile(
r"(load status for <qutebrowser.browser.webview.WebView " r"(load status for <qutebrowser.browser.webview.WebView "
r"tab_id=\d+ url='{url}'>: LoadStatus.success|fetch: " r"tab_id=\d+ url='{url}'>: LoadStatus.success|fetch: "