diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-16 09:55:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-16 09:55:56 +0200 |
| commit | ccee741973a182f65af4e58302c9a76107974f0a (patch) | |
| tree | df1c78b6ad1f044b394862629c08c7a207d67a09 /test/system/015-help.bats | |
| parent | 0e3a0ec7d485a81b7ca38997e93bea69ad95d79a (diff) | |
| parent | cfbc4aaeb50b5fb12ec9363328bb08fc459a1067 (diff) | |
| download | podman-ccee741973a182f65af4e58302c9a76107974f0a.tar.gz podman-ccee741973a182f65af4e58302c9a76107974f0a.tar.bz2 podman-ccee741973a182f65af4e58302c9a76107974f0a.zip | |
Merge pull request #15829 from edsantiago/shlint
Cleanup: fix problems reported by shell lint
Diffstat (limited to 'test/system/015-help.bats')
| -rw-r--r-- | test/system/015-help.bats | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/system/015-help.bats b/test/system/015-help.bats index dd5a7ed44..927645f29 100644 --- a/test/system/015-help.bats +++ b/test/system/015-help.bats @@ -121,7 +121,7 @@ function check_help() { # Exceptions: these commands don't work rootless if is_rootless; then # "pause is not supported for rootless containers" - if [ "$cmd" = "pause" -o "$cmd" = "unpause" ]; then + if [[ "$cmd" = "pause" ]] || [[ "$cmd" = "unpause" ]]; then continue fi # "network rm" too @@ -162,17 +162,17 @@ function check_help() { # Any command that takes subcommands, prints its help and errors if called # without one. - dprint "podman $@" + dprint "podman $*" run_podman '?' "$@" is "$status" 125 "'podman $*' without any subcommand - exit status" - is "$output" ".*Usage:.*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 - dprint "podman $@ NoSuchCommand" + dprint "podman $* NoSuchCommand" run_podman '?' "$@" NoSuchCommand is "$status" 125 "'podman $* NoSuchCommand' - exit status" - is "$output" "Error: unrecognized command .*$@ NoSuchCommand" \ + is "$output" "Error: unrecognized command .*$* NoSuchCommand" \ "'podman $* NoSuchCommand' - expected error message" # This can happen if the output of --help changes, such as between |