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

Escape backslashes in end2end test commands

Browse Source 
Let's hope this fixes stuff on Windows where \ is used as path
separator...
This commit is contained in:
Florian Bruhin 2016-07-12 17:52:05 +02:00
parent 1c86669628
commit e5cab11979
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,13 +358,14 @@ class QuteProc(testprocess.Process):
finally: finally:
super().after_test() super().after_test()
def send_cmd(self, command, count=None, invalid=False): def send_cmd(self, command, count=None, invalid=False, *, escape=True):
"""Send a command to the running qutebrowser instance. """Send a command to the running qutebrowser instance.
Args: Args:
count: The count to pass to the command. count: The count to pass to the command.
invalid: If True, we don't wait for "command called: ..." in the invalid: If True, we don't wait for "command called: ..." in the
log log
escape: Escape backslashes in the command
""" """
summary = command summary = command
if count is not None: if count is not None:
@ -375,6 +376,9 @@ class QuteProc(testprocess.Process):
time.sleep(self._delay / 1000) time.sleep(self._delay / 1000)
if escape:
command = command.replace('\\', r'\\')
if count is not None: if count is not None:
command = ':{}:{}'.format(count, command.lstrip(':')) command = ':{}:{}'.format(count, command.lstrip(':'))
@ -392,9 +396,11 @@ class QuteProc(testprocess.Process):
return msg.message.split(' = ')[1] return msg.message.split(' = ')[1]
def set_setting(self, sect, opt, value): def set_setting(self, sect, opt, value):
# " in a value should be treated literally, so escape it # \ and " in a value should be treated literally, so escape them
value = value.replace('\\', r'\\')
value = value.replace('"', '\\"') value = value.replace('"', '\\"')
self.send_cmd(':set "{}" "{}" "{}"'.format(sect, opt, value)) self.send_cmd(':set "{}" "{}" "{}"'.format(sect, opt, value),
escape=False)
self.wait_for(category='config', message='Config option changed: *') self.wait_for(category='config', message='Config option changed: *')
@contextlib.contextmanager @contextlib.contextmanager
@ -517,7 +523,7 @@ class QuteProc(testprocess.Process):
'elems") }} ' 'elems") }} '
'else {{ console.log("qute:okay"); _es.snapshotItem(0).click() }}' 'else {{ console.log("qute:okay"); _es.snapshotItem(0).click() }}'
).format(text=webelem.javascript_escape(_xpath_escape(text))) ).format(text=webelem.javascript_escape(_xpath_escape(text)))
self.send_cmd(':jseval ' + script) self.send_cmd(':jseval ' + script, escape=False)
message = self.wait_for_js('qute:*').message message = self.wait_for_js('qute:*').message
if message.endswith('qute:no elems'): if message.endswith('qute:no elems'):
raise ValueError('No element with {!r} found'.format(text)) raise ValueError('No element with {!r} found'.format(text))