summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd2/cmd2.py4
-rw-r--r--tests/test_cmd2.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index f7337c1d..0ac1d535 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -2396,7 +2396,7 @@ class Cmd(cmd.Cmd):
self.aliases.clear()
self.poutput("All aliases deleted")
elif not args.name:
- self.do_help('alias delete')
+ self.perror("Either --all or alias name(s) must be specified")
else:
for cur_name in utils.remove_duplicates(args.name):
if cur_name in self.aliases:
@@ -2576,7 +2576,7 @@ class Cmd(cmd.Cmd):
self.macros.clear()
self.poutput("All macros deleted")
elif not args.name:
- self.do_help('macro delete')
+ self.perror("Either --all or macro name(s) must be specified")
else:
for cur_name in utils.remove_duplicates(args.name):
if cur_name in self.macros:
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 01e6e271..d4dbfe55 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -1617,7 +1617,7 @@ def test_alias_delete_non_existing(base_app):
def test_alias_delete_no_name(base_app):
out, err = run_cmd(base_app, 'alias delete')
- assert "Usage: alias delete" in out[0]
+ assert "Either --all or alias name(s)" in err[0]
def test_multiple_aliases(base_app):
alias1 = 'h1'
@@ -1768,7 +1768,7 @@ def test_macro_delete_non_existing(base_app):
def test_macro_delete_no_name(base_app):
out, err = run_cmd(base_app, 'macro delete')
- assert "Usage: macro delete" in out[0]
+ assert "Either --all or macro name(s)" in err[0]
def test_multiple_macros(base_app):
macro1 = 'h1'