github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79754 from draveness/feature/use-framework-expect-equal-instead

Browse Source 
feat: use framework.ExpectEqual in servicecatalog e2e test
This commit is contained in:
Kubernetes Prow Robot 2019-07-05 12:02:37 -07:00 committed by GitHub
commit 5865a7e3cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/servicecatalog/BUILD
View File

@ -20,7 +20,6 @@ go_library(
"//test/e2e/framework/log:go_default_library", "//test/e2e/framework/log:go_default_library",
"//test/utils/image:go_default_library", "//test/utils/image:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
], ],
) )

9
test/e2e/servicecatalog/podpreset.go
View File

@ -32,7 +32,6 @@ import (
e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2elog "k8s.io/kubernetes/test/e2e/framework/log"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
) )
@ -115,7 +114,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
options := metav1.ListOptions{LabelSelector: selector.String()} options := metav1.ListOptions{LabelSelector: selector.String()}
pods, err := podClient.List(options) pods, err := podClient.List(options)
framework.ExpectNoError(err, "failed to query for pod") framework.ExpectNoError(err, "failed to query for pod")
gomega.Expect(len(pods.Items)).To(gomega.Equal(0)) framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{ options = metav1.ListOptions{
LabelSelector: selector.String(), LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion, ResourceVersion: pods.ListMeta.ResourceVersion,
@ -131,7 +130,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
options = metav1.ListOptions{LabelSelector: selector.String()} options = metav1.ListOptions{LabelSelector: selector.String()}
pods, err = podClient.List(options) pods, err = podClient.List(options)
framework.ExpectNoError(err, "failed to query for pod") framework.ExpectNoError(err, "failed to query for pod")
gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) framework.ExpectEqual(len(pods.Items), 1)
ginkgo.By("verifying pod creation was observed") ginkgo.By("verifying pod creation was observed")
select { select {
@ -235,7 +234,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
options := metav1.ListOptions{LabelSelector: selector.String()} options := metav1.ListOptions{LabelSelector: selector.String()}
pods, err := podClient.List(options) pods, err := podClient.List(options)
framework.ExpectNoError(err, "failed to query for pod") framework.ExpectNoError(err, "failed to query for pod")
gomega.Expect(len(pods.Items)).To(gomega.Equal(0)) framework.ExpectEqual(len(pods.Items), 0)
options = metav1.ListOptions{ options = metav1.ListOptions{
LabelSelector: selector.String(), LabelSelector: selector.String(),
ResourceVersion: pods.ListMeta.ResourceVersion, ResourceVersion: pods.ListMeta.ResourceVersion,
@ -251,7 +250,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
options = metav1.ListOptions{LabelSelector: selector.String()} options = metav1.ListOptions{LabelSelector: selector.String()}
pods, err = podClient.List(options) pods, err = podClient.List(options)
framework.ExpectNoError(err, "failed to query for pod") framework.ExpectNoError(err, "failed to query for pod")
gomega.Expect(len(pods.Items)).To(gomega.Equal(1)) framework.ExpectEqual(len(pods.Items), 1)
ginkgo.By("verifying pod creation was observed") ginkgo.By("verifying pod creation was observed")
select { select {