diff --git a/test/e2e/servicecatalog/BUILD b/test/e2e/servicecatalog/BUILD index 186c0b96f5e..ed7d6512cf2 100644 --- a/test/e2e/servicecatalog/BUILD +++ b/test/e2e/servicecatalog/BUILD @@ -20,7 +20,6 @@ go_library( "//test/e2e/framework/log:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", - "//vendor/github.com/onsi/gomega:go_default_library", ], ) diff --git a/test/e2e/servicecatalog/podpreset.go b/test/e2e/servicecatalog/podpreset.go index 76c5cfac466..811dc8e3c08 100644 --- a/test/e2e/servicecatalog/podpreset.go +++ b/test/e2e/servicecatalog/podpreset.go @@ -32,7 +32,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" ) @@ -115,7 +114,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { options := metav1.ListOptions{LabelSelector: selector.String()} pods, err := podClient.List(options) 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{ LabelSelector: selector.String(), ResourceVersion: pods.ListMeta.ResourceVersion, @@ -131,7 +130,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { options = metav1.ListOptions{LabelSelector: selector.String()} pods, err = podClient.List(options) 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") select { @@ -235,7 +234,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { options := metav1.ListOptions{LabelSelector: selector.String()} pods, err := podClient.List(options) 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{ LabelSelector: selector.String(), ResourceVersion: pods.ListMeta.ResourceVersion, @@ -251,7 +250,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() { options = metav1.ListOptions{LabelSelector: selector.String()} pods, err = podClient.List(options) 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") select {