From 8e3074294ad6a34d7cf831e69359e2b43d078bb0 Mon Sep 17 00:00:00 2001 From: cornfeedhobo Date: Sun, 10 Nov 2019 10:51:05 -0600 Subject: [PATCH 1/2] fix deviation between flag and pflag --- flag.go | 2 +- flag_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flag.go b/flag.go index 7c058de3..19852ec9 100644 --- a/flag.go +++ b/flag.go @@ -915,8 +915,8 @@ func VarP(value Value, name, shorthand, usage string) { // returns the error. func (f *FlagSet) failf(format string, a ...interface{}) error { err := fmt.Errorf(format, a...) + fmt.Fprintln(f.Output(), err) if f.errorHandling != ContinueOnError { - fmt.Fprintln(f.Output(), err) f.usage() } return err diff --git a/flag_test.go b/flag_test.go index 58a5d25a..6ba0c877 100644 --- a/flag_test.go +++ b/flag_test.go @@ -860,7 +860,7 @@ func TestSetOutput(t *testing.T) { flags.Init("test", ContinueOnError) flags.Parse([]string{"--unknown"}) if out := buf.String(); !strings.Contains(out, "--unknown") { - t.Logf("expected output mentioning unknown; got %q", out) + t.Errorf("expected output mentioning unknown; got %q", out) } } From 7c4e6b9cac214c50de47174c5e8db6a7fca5b0d7 Mon Sep 17 00:00:00 2001 From: cornfeedhobo Date: Sat, 19 Sep 2020 16:58:56 -0500 Subject: [PATCH 2/2] increase coverage on TestSetOutput --- flag_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flag_test.go b/flag_test.go index 6ba0c877..cad8faf4 100644 --- a/flag_test.go +++ b/flag_test.go @@ -859,9 +859,14 @@ func TestSetOutput(t *testing.T) { flags.SetOutput(&buf) flags.Init("test", ContinueOnError) flags.Parse([]string{"--unknown"}) - if out := buf.String(); !strings.Contains(out, "--unknown") { - t.Errorf("expected output mentioning unknown; got %q", out) + out := buf.String() + if out == "" { + t.Error("expected output, got none") } + if strings.Contains(out, "--unknown") { + return + } + t.Errorf("expected output mentioning unknown; got %q", out) } func TestOutput(t *testing.T) {