github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

revert wrongly replaced log function ginkgo.Fail

Browse Source
This commit is contained in:
Guangming Wang 2019-08-27 10:46:50 +08:00
parent 169cfd9fa1
commit 0776bc67ec
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ import (
"strings"
"github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
)
// FailurePanic is the value that will be panicked from Fail.
@ -65,7 +64,7 @@ func Fail(message string, callerSkip ...int) {
}
}()
e2elog.Fail(message, skip)
ginkgo.Fail(message, skip)
}
// SkipPanic is the value that will be panicked from Skip.

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

@ -34,7 +34,6 @@ import (
"sort"
"strings"
"github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
)

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

@ -26,7 +26,6 @@ import (
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
"github.com/onsi/ginkgo"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
)
type dnsFederationsConfigMapTest struct {
@ -409,12 +408,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 {
e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err))
ginkgo.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 {
e2elog.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err))
ginkgo.Fail(fmt.Sprintf("ginkgo.Failed when creating service: %v", err))
}
defer func() {
ginkgo.By("deleting the test externalName service")

3
test/e2e_kubeadm/e2e_kubeadm_suite_test.go
View File

@ -31,7 +31,6 @@ 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() {
@ -49,7 +48,7 @@ func TestMain(m *testing.M) {
}
func TestE2E(t *testing.T) {
gomega.RegisterFailHandler(e2elog.Fail)
gomega.RegisterFailHandler(ginkgo.Fail)
reporters := []ginkgo.Reporter{}
reportDir := framework.TestContext.ReportDir
if reportDir != "" {

3
test/e2e_node/e2e_node_suite_test.go
View File

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