test/e2e/: use framework.Equal() replace gomega.Expect(...).To(gomega.BeTrue()|BeFalse())

This commit is contained in:
tanjunchen
2019-12-13 09:58:42 +08:00
parent 92a14f4f7e
commit f786cb07b7
14 changed files with 47 additions and 49 deletions

View File

@@ -11,7 +11,6 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
"//test/e2e/framework:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
],
)

View File

@@ -25,8 +25,6 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubernetes/pkg/kubemark"
"k8s.io/kubernetes/test/e2e/framework"
"github.com/onsi/gomega"
)
var (
@@ -77,7 +75,7 @@ func (p *Provider) FrameworkBeforeEach(f *framework.Framework) {
p.controller, err = kubemark.NewKubemarkController(externalClient, externalInformerFactory, f.ClientSet, kubemarkNodeInformer)
framework.ExpectNoError(err)
externalInformerFactory.Start(p.closeChannel)
gomega.Expect(p.controller.WaitForCacheSync(p.closeChannel)).To(gomega.BeTrue())
framework.ExpectEqual(p.controller.WaitForCacheSync(p.closeChannel), true)
go p.controller.Run(p.closeChannel)
}
}