summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
authorMarkus Thömmes <markusthoemmes@me.com>2021-11-04 16:12:34 +0100
committerMarkus Thömmes <markusthoemmes@me.com>2021-11-05 09:34:22 +0100
commit756dda298c76b54a4401b7497bbff297dcf4014f (patch)
tree2f04a1fc5b4da11d38d35969b842977ede578af2 /test/system
parent184de3955ca8cb57e091a1b6006514aade885a59 (diff)
downloadpodman-756dda298c76b54a4401b7497bbff297dcf4014f.tar.gz
podman-756dda298c76b54a4401b7497bbff297dcf4014f.tar.bz2
podman-756dda298c76b54a4401b7497bbff297dcf4014f.zip
Keep error semantics intact
Signed-off-by: Markus Thömmes <markusthoemmes@me.com>
Diffstat (limited to 'test/system')
-rw-r--r--test/system/001-basic.bats2
-rw-r--r--test/system/015-help.bats13
2 files changed, 6 insertions, 9 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 2a6f4bea0..ccc05bb15 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -100,7 +100,7 @@ function setup() {
skip "only applicable on a local run since this requires no endpoint"
fi
- run_podman --remote
+ run_podman 125 --remote
is "$output" ".*Usage:" "podman --remote show usage message without running endpoint"
}
diff --git a/test/system/015-help.bats b/test/system/015-help.bats
index 51660ba12..b2c6e2575 100644
--- a/test/system/015-help.bats
+++ b/test/system/015-help.bats
@@ -143,16 +143,13 @@ function check_help() {
count=$(expr $count + 1)
done
- # Any command that takes subcommands, prints its help if called
+ # Any command that takes subcommands, prints its help and errors if called
# without one.
dprint "podman $@"
-
- # Store the output of the actual --help command
- run_podman "$@" --help
- local full_help="$output"
-
- run_podman "$@"
- is "$output" "$full_help" "'podman $*' without any subcommand - expected help message"
+ run_podman '?' "$@"
+ is "$status" 125 "'podman $*' without any subcommand - exit status"
+ is "$output" ".*Usage:.*Error: missing command '.*$@ COMMAND'" \
+ "'podman $*' without any subcommand - expected error message"
# Assume that 'NoSuchCommand' is not a command
dprint "podman $@ NoSuchCommand"