diff options
| -rw-r--r-- | cmd2/cmd2.py | 2 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index 79313406..a2987a65 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -2022,7 +2022,7 @@ class Cmd(cmd.Cmd): # Confirm we have the correct number of arguments if len(statement.arg_list) != macro.required_arg_count: - self.perror('The macro {} expects {} arguments'.format(statement.command, macro.required_arg_count), + self.perror('The macro {!r} expects {} argument(s)'.format(statement.command, macro.required_arg_count), traceback_war=False) return False diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 430e28dd..e07e6af3 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -1779,6 +1779,8 @@ def test_alias_create_with_quotes(base_app, capsys): assert out == normalize('alias create fake help > "out file.txt"') @pytest.mark.parametrize('alias_name', [ + '""', # Blank name + '!no_shortcut', '">"', '"no>pe"', '"no spaces"', @@ -1786,19 +1788,19 @@ def test_alias_create_with_quotes(base_app, capsys): '"noterm;"', 'noembedded"quotes', ]) -def test_create_invalid_alias(base_app, alias_name, capsys): +def test_alias_create_invalid_name(base_app, alias_name, capsys): run_cmd(base_app, 'alias create {} help'.format(alias_name)) out, err = capsys.readouterr() - assert "cannot contain" in err + assert "cannot" in err -def test_create_alias_with_macro_name(base_app, capsys): - macro_name = "my_macro" - run_cmd(base_app, 'macro create {} help'.format(macro_name)) - run_cmd(base_app, 'alias create {} help'.format(macro_name)) +def test_alias_create_with_macro_name(base_app, capsys): + macro = "my_macro" + run_cmd(base_app, 'macro create {} help'.format(macro)) + run_cmd(base_app, 'alias create {} help'.format(macro)) out, err = capsys.readouterr() assert "cannot have the same name" in err -def test_create_alias_with_empty_command(base_app, capsys): +def test_alias_create_with_empty_command(base_app, capsys): run_cmd(base_app, 'alias create my_alias ""') out, err = capsys.readouterr() assert "cannot resolve to an empty command" in err |