diff --git a/test/e2e/apimachinery/chunking.go b/test/e2e/apimachinery/chunking.go index 5fa2cf459f4..06f7269273b 100644 --- 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 index 6773a47d956..0a0939f7be2 100644 --- 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/testfiles/BUILD b/test/e2e/framework/testfiles/BUILD index b2aa1f83079..6c4b6f2c81e 100644 --- a/test/e2e/framework/testfiles/BUILD +++ b/test/e2e/framework/testfiles/BUILD @@ -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( diff --git a/test/e2e/framework/testfiles/testfiles.go b/test/e2e/framework/testfiles/testfiles.go index f2434925daa..85691cc05f0 100644 --- a/test/e2e/framework/testfiles/testfiles.go +++ b/test/e2e/framework/testfiles/testfiles.go @@ -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