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 != "" {