From 169cfd9fa16459a4a9b150212eddd0a18e6b4ded Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Mon, 26 Aug 2019 22:24:29 +0800 Subject: [PATCH 1/3] Cleanup ginkgo.Fail calls from the e2e test framework --- test/e2e/apimachinery/chunking.go | 2 +- test/e2e/apimachinery/table_conversion.go | 2 +- test/e2e/framework/ginkgowrapper/wrapper.go | 3 ++- test/e2e/framework/testfiles/testfiles.go | 5 +++-- test/e2e/network/dns_configmap.go | 5 +++-- test/e2e_kubeadm/e2e_kubeadm_suite_test.go | 3 ++- test/e2e_node/e2e_node_suite_test.go | 3 ++- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/test/e2e/apimachinery/chunking.go b/test/e2e/apimachinery/chunking.go index 5fa2cf459f4..06f7269273b 100644 --- a/test/e2e/apimachinery/chunking.go +++ b/test/e2e/apimachinery/chunking.go @@ -71,7 +71,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() { } e2elog.Logf("Got an error creating template %d: %v", i, err) } - ginkgo.Fail("Unable to create template %d, exiting", i) + e2elog.Fail("Unable to create template %d, exiting", i) }) }) diff --git a/test/e2e/apimachinery/table_conversion.go b/test/e2e/apimachinery/table_conversion.go index 6773a47d956..0a0939f7be2 100644 --- a/test/e2e/apimachinery/table_conversion.go +++ b/test/e2e/apimachinery/table_conversion.go @@ -100,7 +100,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() { } e2elog.Logf("Got an error creating template %d: %v", i, err) } - ginkgo.Fail("Unable to create template %d, exiting", i) + e2elog.Fail("Unable to create template %d, exiting", i) }) pagedTable := &metav1beta1.Table{} diff --git a/test/e2e/framework/ginkgowrapper/wrapper.go b/test/e2e/framework/ginkgowrapper/wrapper.go index 1cb3de1afdd..0b8e676d8f8 100644 --- a/test/e2e/framework/ginkgowrapper/wrapper.go +++ b/test/e2e/framework/ginkgowrapper/wrapper.go @@ -27,6 +27,7 @@ import ( "strings" "github.com/onsi/ginkgo" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) // FailurePanic is the value that will be panicked from Fail. @@ -64,7 +65,7 @@ func Fail(message string, callerSkip ...int) { } }() - ginkgo.Fail(message, skip) + e2elog.Fail(message, skip) } // SkipPanic is the value that will be panicked from Skip. diff --git a/test/e2e/framework/testfiles/testfiles.go b/test/e2e/framework/testfiles/testfiles.go index f2434925daa..aead7862e5e 100644 --- a/test/e2e/framework/testfiles/testfiles.go +++ b/test/e2e/framework/testfiles/testfiles.go @@ -35,6 +35,7 @@ import ( "strings" "github.com/onsi/ginkgo" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) var filesources []FileSource @@ -73,7 +74,7 @@ type FileSource interface { func ReadOrDie(filePath string) []byte { data, err := Read(filePath) if err != nil { - ginkgo.Fail(err.Error(), 1) + e2elog.Fail(err.Error(), 1) } return data } @@ -110,7 +111,7 @@ func Exists(filePath string) bool { for _, filesource := range filesources { data, err := filesource.ReadTestFile(filePath) if err != nil { - ginkgo.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1) + e2elog.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1) } if data != nil { return true diff --git a/test/e2e/network/dns_configmap.go b/test/e2e/network/dns_configmap.go index 37e072cd3d2..ba3ce501981 100644 --- a/test/e2e/network/dns_configmap.go +++ b/test/e2e/network/dns_configmap.go @@ -26,6 +26,7 @@ import ( e2eservice "k8s.io/kubernetes/test/e2e/framework/service" "github.com/onsi/ginkgo" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) type dnsFederationsConfigMapTest struct { @@ -408,12 +409,12 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) { serviceName := "dns-externalname-upstream-test" externalNameService := e2eservice.CreateServiceSpec(serviceName, googleDNSHostname, false, nil) if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameService); err != nil { - ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) + e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) } serviceNameLocal := "dns-externalname-upstream-local" externalNameServiceLocal := e2eservice.CreateServiceSpec(serviceNameLocal, fooHostname, false, nil) if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameServiceLocal); err != nil { - ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) + e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) } defer func() { ginkgo.By("deleting the test externalName service") diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go index 9a508138f94..6ebdc2cb145 100644 --- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go +++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go @@ -31,6 +31,7 @@ import ( morereporters "github.com/onsi/ginkgo/reporters" "k8s.io/kubernetes/test/e2e/framework" e2econfig "k8s.io/kubernetes/test/e2e/framework/config" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) func init() { @@ -48,7 +49,7 @@ func TestMain(m *testing.M) { } func TestE2E(t *testing.T) { - gomega.RegisterFailHandler(ginkgo.Fail) + gomega.RegisterFailHandler(e2elog.Fail) reporters := []ginkgo.Reporter{} reportDir := framework.TestContext.ReportDir if reportDir != "" { diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index 84c1a6d9b94..ac07275b600 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -42,6 +42,7 @@ import ( commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" e2econfig "k8s.io/kubernetes/test/e2e/framework/config" + e2elog "k8s.io/kubernetes/test/e2e/framework/log" "k8s.io/kubernetes/test/e2e/framework/testfiles" "k8s.io/kubernetes/test/e2e/generated" "k8s.io/kubernetes/test/e2e_node/services" @@ -131,7 +132,7 @@ func TestE2eNode(t *testing.T) { return } // If run-services-mode is not specified, run test. - gomega.RegisterFailHandler(ginkgo.Fail) + gomega.RegisterFailHandler(e2elog.Fail) reporters := []ginkgo.Reporter{} reportDir := framework.TestContext.ReportDir if reportDir != "" { From 0776bc67ec437788678a1de53f8c6e226649d702 Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Tue, 27 Aug 2019 10:46:50 +0800 Subject: [PATCH 2/3] revert wrongly replaced log function ginkgo.Fail --- test/e2e/framework/ginkgowrapper/wrapper.go | 3 +-- test/e2e/framework/testfiles/testfiles.go | 1 - test/e2e/network/dns_configmap.go | 5 ++--- test/e2e_kubeadm/e2e_kubeadm_suite_test.go | 3 +-- test/e2e_node/e2e_node_suite_test.go | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/test/e2e/framework/ginkgowrapper/wrapper.go b/test/e2e/framework/ginkgowrapper/wrapper.go index 0b8e676d8f8..1cb3de1afdd 100644 --- a/test/e2e/framework/ginkgowrapper/wrapper.go +++ b/test/e2e/framework/ginkgowrapper/wrapper.go @@ -27,7 +27,6 @@ import ( "strings" "github.com/onsi/ginkgo" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) // FailurePanic is the value that will be panicked from Fail. @@ -65,7 +64,7 @@ func Fail(message string, callerSkip ...int) { } }() - e2elog.Fail(message, skip) + ginkgo.Fail(message, skip) } // SkipPanic is the value that will be panicked from Skip. diff --git a/test/e2e/framework/testfiles/testfiles.go b/test/e2e/framework/testfiles/testfiles.go index aead7862e5e..85691cc05f0 100644 --- a/test/e2e/framework/testfiles/testfiles.go +++ b/test/e2e/framework/testfiles/testfiles.go @@ -34,7 +34,6 @@ import ( "sort" "strings" - "github.com/onsi/ginkgo" e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) diff --git a/test/e2e/network/dns_configmap.go b/test/e2e/network/dns_configmap.go index ba3ce501981..37e072cd3d2 100644 --- a/test/e2e/network/dns_configmap.go +++ b/test/e2e/network/dns_configmap.go @@ -26,7 +26,6 @@ import ( e2eservice "k8s.io/kubernetes/test/e2e/framework/service" "github.com/onsi/ginkgo" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) type dnsFederationsConfigMapTest struct { @@ -409,12 +408,12 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) { serviceName := "dns-externalname-upstream-test" externalNameService := e2eservice.CreateServiceSpec(serviceName, googleDNSHostname, false, nil) if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameService); err != nil { - e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) + ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) } serviceNameLocal := "dns-externalname-upstream-local" externalNameServiceLocal := e2eservice.CreateServiceSpec(serviceNameLocal, fooHostname, false, nil) if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameServiceLocal); err != nil { - e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) + ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err)) } defer func() { ginkgo.By("deleting the test externalName service") diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go index 6ebdc2cb145..9a508138f94 100644 --- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go +++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go @@ -31,7 +31,6 @@ import ( morereporters "github.com/onsi/ginkgo/reporters" "k8s.io/kubernetes/test/e2e/framework" e2econfig "k8s.io/kubernetes/test/e2e/framework/config" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" ) func init() { @@ -49,7 +48,7 @@ func TestMain(m *testing.M) { } func TestE2E(t *testing.T) { - gomega.RegisterFailHandler(e2elog.Fail) + gomega.RegisterFailHandler(ginkgo.Fail) reporters := []ginkgo.Reporter{} reportDir := framework.TestContext.ReportDir if reportDir != "" { diff --git a/test/e2e_node/e2e_node_suite_test.go b/test/e2e_node/e2e_node_suite_test.go index ac07275b600..84c1a6d9b94 100644 --- a/test/e2e_node/e2e_node_suite_test.go +++ b/test/e2e_node/e2e_node_suite_test.go @@ -42,7 +42,6 @@ import ( commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" e2econfig "k8s.io/kubernetes/test/e2e/framework/config" - e2elog "k8s.io/kubernetes/test/e2e/framework/log" "k8s.io/kubernetes/test/e2e/framework/testfiles" "k8s.io/kubernetes/test/e2e/generated" "k8s.io/kubernetes/test/e2e_node/services" @@ -132,7 +131,7 @@ func TestE2eNode(t *testing.T) { return } // If run-services-mode is not specified, run test. - gomega.RegisterFailHandler(e2elog.Fail) + gomega.RegisterFailHandler(ginkgo.Fail) reporters := []ginkgo.Reporter{} reportDir := framework.TestContext.ReportDir if reportDir != "" { From fcf4e69640a0f0b7a7cba015d8ed27ae76c58c01 Mon Sep 17 00:00:00 2001 From: Guangming Wang Date: Tue, 27 Aug 2019 17:48:46 +0800 Subject: [PATCH 3/3] run hack/update-bazel.sh --- test/e2e/framework/testfiles/BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/framework/testfiles/BUILD b/test/e2e/framework/testfiles/BUILD index b2aa1f83079..6c4b6f2c81e 100644 --- a/test/e2e/framework/testfiles/BUILD +++ b/test/e2e/framework/testfiles/BUILD @@ -5,7 +5,7 @@ go_library( srcs = ["testfiles.go"], importpath = "k8s.io/kubernetes/test/e2e/framework/testfiles", visibility = ["//visibility:public"], - deps = ["//vendor/github.com/onsi/ginkgo:go_default_library"], + deps = ["//test/e2e/framework/log:go_default_library"], ) filegroup(