re
/
cobra
forked from mirror/cobra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace deprecated SetOutput func with SetOut and SetErr in test (#1053)

This commit is contained in:
Kanji Yomoda 2020-04-02 01:25:22 +09:00 committed by GitHub
parent 6607e6b860
commit f62883520e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cobra/cmd/golden_test.go
View File

@ -13,8 +13,10 @@ var update = flag.Bool("update", false, "update .golden files")
func init() { func init() {
// Mute commands. // Mute commands.
addCmd.SetOutput(new(bytes.Buffer)) addCmd.SetOut(new(bytes.Buffer))
initCmd.SetOutput(new(bytes.Buffer)) addCmd.SetErr(new(bytes.Buffer))
initCmd.SetOut(new(bytes.Buffer))
initCmd.SetErr(new(bytes.Buffer))
} }
// ensureLF converts any \r\n to \n // ensureLF converts any \r\n to \n

6
command_test.go
View File

@ -21,7 +21,8 @@ func executeCommand(root *Command, args ...string) (output string, err error) {
func executeCommandWithContext(ctx context.Context, root *Command, args ...string) (output string, err error) { func executeCommandWithContext(ctx context.Context, root *Command, args ...string) (output string, err error) {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
root.SetOutput(buf) root.SetOut(buf)
root.SetErr(buf)
root.SetArgs(args) root.SetArgs(args)
err = root.ExecuteContext(ctx) err = root.ExecuteContext(ctx)
@ -31,7 +32,8 @@ func executeCommandWithContext(ctx context.Context, root *Command, args ...strin
func executeCommandC(root *Command, args ...string) (c *Command, output string, err error) { func executeCommandC(root *Command, args ...string) (c *Command, output string, err error) {
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
root.SetOutput(buf) root.SetOut(buf)
root.SetErr(buf)
root.SetArgs(args) root.SetArgs(args)
c, err = root.ExecuteC() c, err = root.ExecuteC()