github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup ginkgo.Fail calls from the e2e test framework

Browse Source
This commit is contained in:
Guangming Wang 2019-08-26 22:24:29 +08:00
parent 18d7f8839d
commit 169cfd9fa1
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/apimachinery/chunking.go
View File

@ -71,7 +71,7 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
} }
e2elog.Logf("Got an error creating template %d: %v", i, err) 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)
}) })
}) })

2
test/e2e/apimachinery/table_conversion.go
View File

@ -100,7 +100,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
} }
e2elog.Logf("Got an error creating template %d: %v", i, err) 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{} pagedTable := &metav1beta1.Table{}

3
test/e2e/framework/ginkgowrapper/wrapper.go
View File

@ -27,6 +27,7 @@ import (
"strings" "strings"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
) )
// FailurePanic is the value that will be panicked from Fail. // 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. // SkipPanic is the value that will be panicked from Skip.

5
test/e2e/framework/testfiles/testfiles.go
View File

@ -35,6 +35,7 @@ import (
"strings" "strings"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
) )
var filesources []FileSource var filesources []FileSource
@ -73,7 +74,7 @@ type FileSource interface {
func ReadOrDie(filePath string) []byte { func ReadOrDie(filePath string) []byte {
data, err := Read(filePath) data, err := Read(filePath)
if err != nil { if err != nil {
ginkgo.Fail(err.Error(), 1) e2elog.Fail(err.Error(), 1)
} }
return data return data
} }
@ -110,7 +111,7 @@ func Exists(filePath string) bool {
for _, filesource := range filesources { for _, filesource := range filesources {
data, err := filesource.ReadTestFile(filePath) data, err := filesource.ReadTestFile(filePath)
if err != nil { 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 { if data != nil {
return true return true

5
test/e2e/network/dns_configmap.go
View File

@ -26,6 +26,7 @@ import (
e2eservice "k8s.io/kubernetes/test/e2e/framework/service" e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
) )
type dnsFederationsConfigMapTest struct { type dnsFederationsConfigMapTest struct {
@ -408,12 +409,12 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
serviceName := "dns-externalname-upstream-test" serviceName := "dns-externalname-upstream-test"
externalNameService := e2eservice.CreateServiceSpec(serviceName, googleDNSHostname, false, nil) externalNameService := e2eservice.CreateServiceSpec(serviceName, googleDNSHostname, false, nil)
if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameService); err != 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" serviceNameLocal := "dns-externalname-upstream-local"
externalNameServiceLocal := e2eservice.CreateServiceSpec(serviceNameLocal, fooHostname, false, nil) externalNameServiceLocal := e2eservice.CreateServiceSpec(serviceNameLocal, fooHostname, false, nil)
if _, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Create(externalNameServiceLocal); err != 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() { defer func() {
ginkgo.By("deleting the test externalName service") ginkgo.By("deleting the test externalName service")

3
test/e2e_kubeadm/e2e_kubeadm_suite_test.go
View File

@ -31,6 +31,7 @@ import (
morereporters "github.com/onsi/ginkgo/reporters" morereporters "github.com/onsi/ginkgo/reporters"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2econfig "k8s.io/kubernetes/test/e2e/framework/config" e2econfig "k8s.io/kubernetes/test/e2e/framework/config"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
) )
func init() { func init() {
@ -48,7 +49,7 @@ func TestMain(m *testing.M) {
} }
func TestE2E(t *testing.T) { func TestE2E(t *testing.T) {
gomega.RegisterFailHandler(ginkgo.Fail) gomega.RegisterFailHandler(e2elog.Fail)
reporters := []ginkgo.Reporter{} reporters := []ginkgo.Reporter{}
reportDir := framework.TestContext.ReportDir reportDir := framework.TestContext.ReportDir
if reportDir != "" { if reportDir != "" {

3
test/e2e_node/e2e_node_suite_test.go
View File

@ -42,6 +42,7 @@ import (
commontest "k8s.io/kubernetes/test/e2e/common" commontest "k8s.io/kubernetes/test/e2e/common"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2econfig "k8s.io/kubernetes/test/e2e/framework/config" 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/framework/testfiles"
"k8s.io/kubernetes/test/e2e/generated" "k8s.io/kubernetes/test/e2e/generated"
"k8s.io/kubernetes/test/e2e_node/services" "k8s.io/kubernetes/test/e2e_node/services"
@ -131,7 +132,7 @@ func TestE2eNode(t *testing.T) {
return return
} }
// If run-services-mode is not specified, run test. // If run-services-mode is not specified, run test.
gomega.RegisterFailHandler(ginkgo.Fail) gomega.RegisterFailHandler(e2elog.Fail)
reporters := []ginkgo.Reporter{} reporters := []ginkgo.Reporter{}
reportDir := framework.TestContext.ReportDir reportDir := framework.TestContext.ReportDir
if reportDir != "" { if reportDir != "" {