From 0b326831e1aaa313c30351c949af4c247817584a Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 7 Nov 2019 20:49:28 +0200 Subject: [PATCH] e2e_kubeadm: fix missing suite --test* flags For more details see 00e1ffb4e015c9a033b6c1f5446e70822af4e964. --- test/e2e_kubeadm/e2e_kubeadm_suite_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go index c2b23e1b3d3..52b5bb8a409 100644 --- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go +++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go @@ -33,15 +33,12 @@ import ( e2econfig "k8s.io/kubernetes/test/e2e/framework/config" ) -func init() { +func TestMain(m *testing.M) { + // Copy go flags in TestMain, to ensure go test flags are registered (no longer available in init() as of go1.13) e2econfig.CopyFlags(e2econfig.Flags, flag.CommandLine) framework.RegisterCommonFlags(flag.CommandLine) framework.RegisterClusterFlags(flag.CommandLine) - pflag.CommandLine.AddGoFlagSet(flag.CommandLine) -} - -func TestMain(m *testing.M) { pflag.Parse() framework.AfterReadingAllFlags(&framework.TestContext) os.Exit(m.Run())