Merge pull request #327 from bogem/fixes

Some small fixes
This commit is contained in:
Eric Paris 2016-08-22 09:59:44 -04:00 committed by GitHub
commit 1f4717172e
3 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ import (
) )
const ( const (
BashCompFilenameExt = "cobra_annotation_bash_completion_filename_extentions" BashCompFilenameExt = "cobra_annotation_bash_completion_filename_extensions"
BashCompCustom = "cobra_annotation_bash_completion_custom" BashCompCustom = "cobra_annotation_bash_completion_custom"
BashCompOneRequiredFlag = "cobra_annotation_bash_completion_one_required_flag" BashCompOneRequiredFlag = "cobra_annotation_bash_completion_one_required_flag"
BashCompSubdirsInDir = "cobra_annotation_bash_completion_subdirs_in_dir" BashCompSubdirsInDir = "cobra_annotation_bash_completion_subdirs_in_dir"

View File

@ -919,12 +919,12 @@ func TestRootUnknownCommandSilenced(t *testing.T) {
s := "Run 'cobra-test --help' for usage.\n" s := "Run 'cobra-test --help' for usage.\n"
if r.Output != "" { if r.Output != "" {
t.Errorf("Unexpected response.\nExpecting to be: \n\"\"\n Got:\n %q\n", s, r.Output) t.Errorf("Unexpected response.\nExpecting to be:\n %q\nGot:\n %q\n", s, r.Output)
} }
r = noRRSetupTestSilenced("--strtwo=a bogus") r = noRRSetupTestSilenced("--strtwo=a bogus")
if r.Output != "" { if r.Output != "" {
t.Errorf("Unexpected response.\nExpecting to be:\n\"\"\nGot:\n %q\n", s, r.Output) t.Errorf("Unexpected response.\nExpecting to be:\n %q\nGot:\n %q\n", s, r.Output)
} }
} }

View File

@ -993,7 +993,7 @@ func (c *Command) IsHelpCommand() bool {
return true return true
} }
// HasHelpSubCommands determines if a command has any avilable 'help' sub commands // HasHelpSubCommands determines if a command has any available 'help' sub commands
// that need to be shown in the usage/help default template under 'additional help // that need to be shown in the usage/help default template under 'additional help
// topics' // topics'
func (c *Command) HasHelpSubCommands() bool { func (c *Command) HasHelpSubCommands() bool {