Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ func (f *FlagSet) getUnknownFlagsHandling() UnknownFlagsHandling {
// then, check deprecated ParseErrorsWhitelist:
// if UnknownFlagsHandling is set, use it
if f.ParseErrorsWhitelist.UnknownFlagsHandling != ErrorOnUnknownFlag {
return f.ParseErrorsAllowlist.UnknownFlagsHandling
return f.ParseErrorsWhitelist.UnknownFlagsHandling
}

if f.ParseErrorsWhitelist.UnknownFlags {
Expand Down
16 changes: 14 additions & 2 deletions flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,16 @@ func testParseWithUnknownFlags(f *FlagSet, t *testing.T, setUnknownFlags func(f
}
}

func testParseWithUnknownFlagsAndPassToArgs(f *FlagSet, t *testing.T) {
func testParseWithUnknownFlagsAndPassToArgs(f *FlagSet, t *testing.T, setUp ...func(*FlagSet)) {
if f.Parsed() {
t.Fatal("f.Parse() = true before Parse")
}
f.ParseErrorsAllowlist.UnknownFlagsHandling = PassUnknownFlagToArgs
if len(setUp) == 0 {
f.ParseErrorsAllowlist.UnknownFlagsHandling = PassUnknownFlagToArgs
}
for _, s := range setUp {
s(f)
}
f.SetInterspersed(true)

f.BoolP("boola", "a", false, "bool value")
Expand Down Expand Up @@ -822,6 +827,13 @@ func TestIgnoreUnknownFlagsAndPassToArgs(t *testing.T) {
ResetForTesting(func() { t.Error("bad parse") })
testParseWithUnknownFlagsAndPassToArgs(GetCommandLine(), t)
}

func TestIgnoreUnknownFlagsAndPassToArgsBackwardsCompat(t *testing.T) {
ResetForTesting(func() { t.Error("bad parse") })
testParseWithUnknownFlagsAndPassToArgs(GetCommandLine(), t, func(f *FlagSet) {
f.ParseErrorsWhitelist.UnknownFlagsHandling = PassUnknownFlagToArgs
})
}
func TestFlagSetParse(t *testing.T) {
testParse(NewFlagSet("test", ContinueOnError), t)
}
Expand Down
Loading