github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81948 from beautytiger/ginkgo_fail

Browse Source 
Cleanup ginkgo.Fail calls from the e2e test framework
This commit is contained in:
Kubernetes Prow Robot 2019-08-28 05:11:55 -07:00 committed by GitHub
commit af359c38e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 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{}

2
test/e2e/framework/testfiles/BUILD
View File

@ -5,7 +5,7 @@ go_library(
srcs = ["testfiles.go"], srcs = ["testfiles.go"],
importpath = "k8s.io/kubernetes/test/e2e/framework/testfiles", importpath = "k8s.io/kubernetes/test/e2e/framework/testfiles",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = ["//vendor/github.com/onsi/ginkgo:go_default_library"], deps = ["//test/e2e/framework/log:go_default_library"],
) )
filegroup( filegroup(

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

@ -34,7 +34,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/onsi/ginkgo" e2elog "k8s.io/kubernetes/test/e2e/framework/log"
) )
var filesources []FileSource var filesources []FileSource
@ -73,7 +73,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 +110,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