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

Merge pull request #78922 from oomichi/add-ExpectEqual

Browse Source 
Add ExpectEqual() to e2e framework
This commit is contained in:
Kubernetes Prow Robot
2019-06-25 01:14:50 -07:00
committed by GitHub
parent cff6e42005 66a3817d62
commit bbc17310fc
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/apimachinery/generated_clientset.go
View File

@@ -33,7 +33,6 @@ import (
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@@ -116,7 +115,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
e2elog.Failf("Failed to query for pods: %v", err)
}
gomega.Expect(len(pods.Items)).To(gomega.Equal(0))
framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{
LabelSelector: selector,
ResourceVersion: pods.ListMeta.ResourceVersion,
@@ -141,7 +140,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
e2elog.Failf("Failed to query for pods: %v", err)
}
gomega.Expect(len(pods.Items)).To(gomega.Equal(1))
framework.ExpectEqual(len(pods.Items), 1)
ginkgo.By("verifying pod creation was observed")
observeCreation(w)
@@ -232,7 +231,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
e2elog.Failf("Failed to query for cronJobs: %v", err)
}
gomega.Expect(len(cronJobs.Items)).To(gomega.Equal(0))
framework.ExpectEqual(len(cronJobs.Items), 0)
options = metav1.ListOptions{
LabelSelector: selector,
ResourceVersion: cronJobs.ListMeta.ResourceVersion,
@@ -257,7 +256,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
e2elog.Failf("Failed to query for cronJobs: %v", err)
}
gomega.Expect(len(cronJobs.Items)).To(gomega.Equal(1))
framework.ExpectEqual(len(cronJobs.Items), 1)
ginkgo.By("verifying cronJob creation was observed")
observeCreation(w)
@@ -274,6 +273,6 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
e2elog.Failf("Failed to list cronJobs to verify deletion: %v", err)
}
gomega.Expect(len(cronJobs.Items)).To(gomega.Equal(0))
framework.ExpectEqual(len(cronJobs.Items), 0)
})
})

7
test/e2e/framework/util.go
View File

@@ -1348,6 +1348,11 @@ func RandomSuffix() string {
return strconv.Itoa(r.Int() % 10000)
}
// ExpectEqual expects the specified two are the same, otherwise an exception raises
func ExpectEqual(actual interface{}, extra interface{}, explain ...interface{}) {
gomega.Expect(actual).To(gomega.Equal(extra), explain...)
}
// ExpectError expects an error happens, otherwise an exception raises
func ExpectError(err error, explain ...interface{}) {
gomega.Expect(err).To(gomega.HaveOccurred(), explain...)
@@ -2072,7 +2077,7 @@ func ExpectNodeHasLabel(c clientset.Interface, nodeName string, labelKey string,
ginkgo.By("verifying the node has the label " + labelKey + " " + labelValue)
node, err := c.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
ExpectNoError(err)
gomega.Expect(node.Labels[labelKey]).To(gomega.Equal(labelValue))
ExpectEqual(node.Labels[labelKey], labelValue)
}
// RemoveTaintOffNode removes the given taint from the given node.