fbc084e416
CommandRunner.parse had some logic for handling commands of form :<count>:cmd. However, this complicated the parsing logic for something that appears to only be used in tests. One could use it in a userscript, but this is unlikely as it is undocumented. Removing support for this simplifies the logic of parse. The commnd `run-with-count` is added to provide this functionality. It works like `repeat` but passes the count along to the command instead of running the command multiple times. This resolves #1997: Qutebrowser crashes when pasting commands. This bug was caused by excess stripping of ':' from the command string by _parse_count.
75 lines
2.6 KiB
Python
75 lines
2.6 KiB
Python
# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
|
|
|
|
# Copyright 2015-2016 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
|
|
#
|
|
# This file is part of qutebrowser.
|
|
#
|
|
# qutebrowser is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# qutebrowser is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
"""Tests for qutebrowser.commands.runners."""
|
|
|
|
import pytest
|
|
|
|
from qutebrowser.commands import runners, cmdexc
|
|
|
|
|
|
class TestCommandRunner:
|
|
|
|
"""Tests for CommandRunner."""
|
|
|
|
def test_parse_all(self, cmdline_test):
|
|
"""Test parsing of commands.
|
|
|
|
See https://github.com/The-Compiler/qutebrowser/issues/615
|
|
|
|
Args:
|
|
cmdline_test: A pytest fixture which provides testcases.
|
|
"""
|
|
cr = runners.CommandRunner(0)
|
|
if cmdline_test.valid:
|
|
list(cr.parse_all(cmdline_test.cmd, aliases=False))
|
|
else:
|
|
with pytest.raises(cmdexc.NoSuchCommandError):
|
|
list(cr.parse_all(cmdline_test.cmd, aliases=False))
|
|
|
|
def test_parse_all_with_alias(self, cmdline_test, config_stub):
|
|
config_stub.data = {'aliases': {'alias_name': cmdline_test.cmd}}
|
|
|
|
cr = runners.CommandRunner(0)
|
|
if cmdline_test.valid:
|
|
assert len(list(cr.parse_all("alias_name"))) > 0
|
|
else:
|
|
with pytest.raises(cmdexc.NoSuchCommandError):
|
|
list(cr.parse_all("alias_name"))
|
|
|
|
@pytest.mark.parametrize('command', ['', ' '])
|
|
def test_parse_empty_with_alias(self, command):
|
|
"""An empty command should not crash.
|
|
|
|
See https://github.com/The-Compiler/qutebrowser/issues/1690
|
|
and https://github.com/The-Compiler/qutebrowser/issues/1773
|
|
"""
|
|
cr = runners.CommandRunner(0)
|
|
with pytest.raises(cmdexc.NoSuchCommandError):
|
|
list(cr.parse_all(command))
|
|
|
|
def test_partial_parsing(self):
|
|
"""Test partial parsing with a runner where it's enabled.
|
|
|
|
The same with it being disabled is tested by test_parse_all.
|
|
"""
|
|
cr = runners.CommandRunner(0, partial_match=True)
|
|
result = cr.parse('message-i')
|
|
assert result.cmd.name == 'message-info'
|