containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11953 from markusthoemmes/help-default 

Display help text on empty subcommand by default
This commit is contained in:
OpenShift Merge Robot 2021-11-08 18:23:17 +01:00 committed by GitHub
parent 22ef488d24 756dda298c
commit abfec8144a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/podman/validate/args.go
View File

@ -27,7 +27,8 @@ func SubCommandExists(cmd *cobra.Command, args []string) error {
} }
return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t")) return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t"))
} }
return errors.Errorf("missing command '%[1]s COMMAND'\nTry '%[1]s --help' for more information.", cmd.CommandPath()) cmd.Help()
return errors.Errorf("missing command '%[1]s COMMAND'", cmd.CommandPath())
} }
// IDOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag // IDOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag

4
test/system/001-basic.bats
View File

@ -120,9 +120,7 @@ function setup() {
fi fi
run_podman 125 --remote run_podman 125 --remote
is "$output" "Error: missing command 'podman COMMAND' is "$output" ".*Usage:" "podman --remote show usage message without running endpoint"
Try 'podman --help' for more information." \
"podman --remote show usage message without running endpoint"
} }
# This is for development only; it's intended to make sure our timeout # This is for development only; it's intended to make sure our timeout

4
test/system/015-help.bats
View File

@ -149,12 +149,12 @@ function check_help() {
count=$(expr $count + 1) count=$(expr $count + 1)
done 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. # without one.
dprint "podman $@" dprint "podman $@"
run_podman '?' "$@" run_podman '?' "$@"
is "$status" 125 "'podman $*' without any subcommand - exit status" 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" "'podman $*' without any subcommand - expected error message"
# Assume that 'NoSuchCommand' is not a command # Assume that 'NoSuchCommand' is not a command