mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #81948 from beautytiger/ginkgo_fail
Cleanup ginkgo.Fail calls from the e2e test framework
This commit is contained in:
commit
af359c38e9
@ -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)
|
||||
})
|
||||
})
|
||||
|
||||
|
@ -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{}
|
||||
|
@ -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(
|
||||
|
@ -34,7 +34,7 @@ import (
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/onsi/ginkgo"
|
||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||
)
|
||||
|
||||
var filesources []FileSource
|
||||
@ -73,7 +73,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 +110,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
|
||||
|
Loading…
Reference in New Issue
Block a user