Merge pull request #3926 from zhsj/bpo-3744

estesp · web-flow · commit e4356016b673 · 2020-01-03T22:12:49.000-05:00
[release/1.3 backport] Move flag.Parse in tests to TestMain
diff --git a/client_test.go b/client_test.go
@@ -54,7 +54,6 @@ func init() {
 	flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")
 	flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")
 	flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests")
-	flag.Parse()
 }
 
 func testContext(t testing.TB) (context.Context, context.CancelFunc) {
@@ -67,6 +66,7 @@ func testContext(t testing.TB) (context.Context, context.CancelFunc) {
 }
 
 func TestMain(m *testing.M) {
+	flag.Parse()
 	if testing.Short() {
 		os.Exit(m.Run())
 	}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ func init() {`
`54`	`54`	`flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests")`
`55`	`55`	`flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests")`
`56`	`56`	`flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests")`
`57`		`- flag.Parse()`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`func testContext(t testing.TB) (context.Context, context.CancelFunc) {`
`@@ -67,6 +66,7 @@ func testContext(t testing.TB) (context.Context, context.CancelFunc) {`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`func TestMain(m *testing.M) {`
	`69`	`+ flag.Parse()`
`70`	`70`	`if testing.Short() {`
`71`	`71`	`os.Exit(m.Run())`
`72`	`72`	`}`