Cleanup ginkgo.Fail calls from the e2e test framework

Guangming Wang · Guangming Wang · commit 169cfd9fa164 · 2019-08-26T22:24:29.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 != "" {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {`
`71`	`71`	`}`
`72`	`72`	`e2elog.Logf("Got an error creating template %d: %v", i, err)`
`73`	`73`	`}`
`74`		`- ginkgo.Fail("Unable to create template %d, exiting", i)`
	`74`	`+ e2elog.Fail("Unable to create template %d, exiting", i)`
`75`	`75`	`})`
`76`	`76`	`})`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {`
`100`	`100`	`}`
`101`	`101`	`e2elog.Logf("Got an error creating template %d: %v", i, err)`
`102`	`102`	`}`
`103`		`- ginkgo.Fail("Unable to create template %d, exiting", i)`
	`103`	`+ e2elog.Fail("Unable to create template %d, exiting", i)`
`104`	`104`	`})`
`105`	`105`
`106`	`106`	`pagedTable := &metav1beta1.Table{}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import (`
`27`	`27`	`"strings"`
`28`	`28`
`29`	`29`	`"github.com/onsi/ginkgo"`
	`30`	`+ e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`// FailurePanic is the value that will be panicked from Fail.`
`@@ -64,7 +65,7 @@ func Fail(message string, callerSkip ...int) {`
`64`	`65`	`}`
`65`	`66`	`}()`
`66`	`67`
`67`		`- ginkgo.Fail(message, skip)`
	`68`	`+ e2elog.Fail(message, skip)`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`// SkipPanic is the value that will be panicked from Skip.`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ import (`
`35`	`35`	`"strings"`
`36`	`36`
`37`	`37`	`"github.com/onsi/ginkgo"`
	`38`	`+ e2elog "k8s.io/kubernetes/test/e2e/framework/log"`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`var filesources []FileSource`
`@@ -73,7 +74,7 @@ type FileSource interface {`
`73`	`74`	`func ReadOrDie(filePath string) []byte {`
`74`	`75`	`data, err := Read(filePath)`
`75`	`76`	`if err != nil {`
`76`		`- ginkgo.Fail(err.Error(), 1)`
	`77`	`+ e2elog.Fail(err.Error(), 1)`
`77`	`78`	`}`
`78`	`79`	`return data`
`79`	`80`	`}`
`@@ -110,7 +111,7 @@ func Exists(filePath string) bool {`
`110`	`111`	`for _, filesource := range filesources {`
`111`	`112`	`data, err := filesource.ReadTestFile(filePath)`
`112`	`113`	`if err != nil {`
`113`		`- ginkgo.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1)`
	`114`	`+ e2elog.Fail(fmt.Sprintf("fatal error looking for test file %s: %s", filePath, err), 1)`
`114`	`115`	`}`
`115`	`116`	`if data != nil {`
`116`	`117`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ 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"`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`func init() {`
`@@ -48,7 +49,7 @@ func TestMain(m *testing.M) {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`func TestE2E(t *testing.T) {`
`51`		`- gomega.RegisterFailHandler(ginkgo.Fail)`
	`52`	`+ gomega.RegisterFailHandler(e2elog.Fail)`
`52`	`53`	`reporters := []ginkgo.Reporter{}`
`53`	`54`	`reportDir := framework.TestContext.ReportDir`
`54`	`55`	`if reportDir != "" {`