Commit9ad3e70

committed

Port over some of clibase

1 parent4fef87b commit9ad3e70Copy full SHA for 9ad3e70

File tree

-22

lines changed

-22

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ func (i Invokation) run(state runState) error {`
`185`	`185`
`186`	`186`	`ifi.parsedFlags==nil {`
`187`	`187`	`i.parsedFlags=pflag.NewFlagSet(i.Command.Name(),pflag.ContinueOnError)`
	`188`	`+// We handle Usage ourselves.`
`188`	`189`	`i.parsedFlags.Usage=func() {}`
`189`	`190`	`}`
`190`	`191`

Lines changed: 0 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -349,24 +349,3 @@ func TestCommand_HyphenHypen(t *testing.T) {`
`349`	`349`
`350`	`350`	`require.Equal(t,"--verbose --friendly",stdio.Stdout.String())`
`351`	`351`	`}`
`352`		`-`
`353`		`-funcTestCommand_Help(t*testing.T) {`
`354`		`-t.Parallel()`
`355`		`-`
`356`		`-cmd:=&clibase.Cmd{`
`357`		`-Options: []clibase.Option{`
`358`		`-{`
`359`		`-Flag:"superautopets",`
`360`		`-},`
`361`		`-},`
`362`		`-Handler:func(i*clibase.Invokation)error {`
`363`		`-t.Fatalf("should not be called")`
`364`		`-returnnil`
`365`		`-},`
`366`		`-}`
`367`		`-`
`368`		`-inv,stdio:=clibasetest.Invoke(cmd,"-h")`
`369`		`-err:=inv.Run()`
`370`		`-require.NoError(t,err)`
`371`		`-require.Contains(t,stdio.Stdout.String(),"superautopets")`
`372`		`-}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,9 @@ func TestOptionSet_ParseEnv(t *testing.T) {`
`111`	`111`	`err:=os.SetDefaults()`
`112`	`112`	`require.NoError(t,err)`
`113`	`113`
`114`		`-err=os.ParseEnv("CODER_", []string{"CODER_WORKSPACE_NAME="})`
	`114`	`+err=os.ParseEnv(`
	`115`	`+clibase.ParseEnviron([]string{"CODER_WORKSPACE_NAME="},"CODER_"),`
	`116`	`+)`
`115`	`117`	`require.NoError(t,err)`
`116`	`118`	`require.EqualValues(t,"defname",workspaceName)`
`117`	`119`	`})`

Comments

(0)