Fix mflag test issue with "ResetForTesting" (which only showed up und…

…er dyntest for some odd reason) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
moby · Jan 23, 2014 · f60eee4 · f60eee4
1 parent 7687b3c
commit f60eee4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/pkg/mflag/export_test.go b/pkg/mflag/export_test.go
diff --git a/pkg/mflag/flag_test.go b/pkg/mflag/flag_test.go
@@ -15,6 +15,13 @@ import (
 	"time"
 )
 
+// ResetForTesting clears all flag state and sets the usage function as directed.
+// After calling ResetForTesting, parse errors in flag handling will not
+// exit the program.
+func ResetForTesting(usage func()) {
+	CommandLine = NewFlagSet(os.Args[0], ContinueOnError)
+	Usage = usage
+}
 func boolString(s string) string {
 	if s == "0" {
 		return "false"