revert wrongly replaced log function ginkgo.Fail

Guangming Wang · Guangming Wang · commit 0776bc67ec43 · 2019-08-27T10:46:50.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 != "" {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ import (`
`27`	`27`	`"strings"`
`28`	`28`
`29`	`29`	`"github.com/onsi/ginkgo"`
`30`		`- e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`31`	`30`	`)`
`32`	`31`
`33`	`32`	`// FailurePanic is the value that will be panicked from Fail.`
`@@ -65,7 +64,7 @@ func Fail(message string, callerSkip ...int) {`
`65`	`64`	`}`
`66`	`65`	`}()`
`67`	`66`
`68`		`- e2elog.Fail(message, skip)`
	`67`	`+ ginkgo.Fail(message, skip)`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`// SkipPanic is the value that will be panicked from Skip.`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import (`
`34`	`34`	`"sort"`
`35`	`35`	`"strings"`
`36`	`36`
`37`		`- "github.com/onsi/ginkgo"`
`38`	`37`	`e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`39`	`38`	`)`
`40`	`39`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ import (`
`31`	`31`	`morereporters "github.com/onsi/ginkgo/reporters"`
`32`	`32`	`"k8s.io/kubernetes/test/e2e/framework"`
`33`	`33`	`e2econfig "k8s.io/kubernetes/test/e2e/framework/config"`
`34`		`- e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`35`	`34`	`)`
`36`	`35`
`37`	`36`	`func init() {`
`@@ -49,7 +48,7 @@ func TestMain(m *testing.M) {`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`func TestE2E(t *testing.T) {`
`52`		`- gomega.RegisterFailHandler(e2elog.Fail)`
	`51`	`+ gomega.RegisterFailHandler(ginkgo.Fail)`
`53`	`52`	`reporters := []ginkgo.Reporter{}`
`54`	`53`	`reportDir := framework.TestContext.ReportDir`
`55`	`54`	`if reportDir != "" {`