diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-08 18:23:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-08 18:23:17 +0100 |
commit | abfec8144a57265e644dbfec93f5b6201b7da945 (patch) | |
tree | eb4eab305260adce08c6071e03a1fb858b385b14 /test | |
parent | 22ef488d246effddbb3f390dd3fd048dc0f5fe82 (diff) | |
parent | 756dda298c76b54a4401b7497bbff297dcf4014f (diff) | |
download | podman-abfec8144a57265e644dbfec93f5b6201b7da945.tar.gz podman-abfec8144a57265e644dbfec93f5b6201b7da945.tar.bz2 podman-abfec8144a57265e644dbfec93f5b6201b7da945.zip |
Merge pull request #11953 from markusthoemmes/help-default
Display help text on empty subcommand by default
Diffstat (limited to 'test')
-rw-r--r-- | test/system/001-basic.bats | 4 | ||||
-rw-r--r-- | test/system/015-help.bats | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats index 78b8ecdfd..03f07d602 100644 --- a/test/system/001-basic.bats +++ b/test/system/001-basic.bats @@ -120,9 +120,7 @@ function setup() { fi run_podman 125 --remote - is "$output" "Error: missing command 'podman COMMAND' -Try 'podman --help' for more information." \ - "podman --remote show usage message without running endpoint" + is "$output" ".*Usage:" "podman --remote show usage message without running endpoint" } # This is for development only; it's intended to make sure our timeout diff --git a/test/system/015-help.bats b/test/system/015-help.bats index b0795b524..a87081687 100644 --- a/test/system/015-help.bats +++ b/test/system/015-help.bats @@ -149,12 +149,12 @@ function check_help() { count=$(expr $count + 1) done - # Any command that takes subcommands, must throw error if called + # Any command that takes subcommands, prints its help and errors if called # without one. dprint "podman $@" run_podman '?' "$@" is "$status" 125 "'podman $*' without any subcommand - exit status" - is "$output" "Error: missing command .*$@ COMMAND" \ + is "$output" ".*Usage:.*Error: missing command '.*$@ COMMAND'" \ "'podman $*' without any subcommand - expected error message" # Assume that 'NoSuchCommand' is not a command |