github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Add ExpectEqual() to e2e framework

Browse Source 
Many e2e tests expect two values are the same, such check is one of
common things in tests. Now gomega.Expect(foo).To(gomega.Equal(bar))
is doing that, this adds ExpectEqual() for replacing the above call
for readable code.
In addition, this replaces under apimachinery/generated_clientset.go
as a sample.
This commit is contained in:
Kenichi Omichi 2019-06-11 23:22:57 +00:00
parent 71a7be41e0
commit 66a3817d62
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,6 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
imageutils "k8s.io/kubernetes/test/utils/image"
)
@ -115,7 +114,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
framework.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,
@ -140,7 +139,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
framework.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)
@ -231,7 +230,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
framework.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,
@ -256,7 +255,7 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
framework.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)
@ -273,6 +272,6 @@ var _ = SIGDescribe("Generated clientset", func() {
if err != nil {
framework.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

@ -1368,6 +1368,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...)
@ -2092,7 +2097,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.