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

Fix bad merge

Browse Source
This commit is contained in:
Florian Bruhin 2016-11-24 08:20:16 +01:00
parent 002e30a6ca
commit 34dd30e984
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/end2end/features/conftest.py
View File

@ -196,6 +196,9 @@ def open_path(quteproc, path):
if path.endswith(new_tab_suffix): if path.endswith(new_tab_suffix):
path = path[:-len(new_tab_suffix)] path = path[:-len(new_tab_suffix)]
new_tab = True new_tab = True
elif path.endswith(new_bg_tab_suffix):
path = path[:-len(new_bg_tab_suffix)]
new_bg_tab = True
elif path.endswith(new_window_suffix): elif path.endswith(new_window_suffix):
path = path[:-len(new_window_suffix)] path = path[:-len(new_window_suffix)]
new_window = True new_window = True
@ -208,20 +211,6 @@ def open_path(quteproc, path):
else: else:
break break
if path.endswith(new_tab_suffix):
path = path[:-len(new_tab_suffix)]
new_tab = True
elif path.endswith(new_bg_tab_suffix):
path = path[:-len(new_bg_tab_suffix)]
new_bg_tab = True
elif path.endswith(new_window_suffix):
path = path[:-len(new_window_suffix)]
new_window = True
if path.endswith(do_not_wait_suffix):
path = path[:-len(do_not_wait_suffix)]
wait = False
quteproc.open_path(path, new_tab=new_tab, new_bg_tab=new_bg_tab, quteproc.open_path(path, new_tab=new_tab, new_bg_tab=new_bg_tab,
new_window=new_window, as_url=as_url, wait=wait) new_window=new_window, as_url=as_url, wait=wait)

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

@ -481,7 +481,7 @@ class QuteProc(testprocess.Process):
"""Open the given path on the local webserver in qutebrowser.""" """Open the given path on the local webserver in qutebrowser."""
url = self.path_to_url(path, port=port, https=https) url = self.path_to_url(path, port=port, https=https)
self.open_url(url, new_tab=new_tab, new_bg_tab=new_bg_tab, self.open_url(url, new_tab=new_tab, new_bg_tab=new_bg_tab,
new_window=new_window, wait=wait) new_window=new_window, as_url=as_url, wait=wait)
def open_url(self, url, *, new_tab=False, new_bg_tab=False, def open_url(self, url, *, new_tab=False, new_bg_tab=False,
new_window=False, as_url=False, wait=True): new_window=False, as_url=False, wait=True):