From 749e76351f00f2fd3ef97cc31d760cdba64d6f1f Mon Sep 17 00:00:00 2001 From: toyoda Date: Fri, 24 May 2019 13:21:48 +0900 Subject: [PATCH] change BeTrue to Equal or BeNumerically in cronjob e2e test --- test/e2e/apps/cronjob.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/apps/cronjob.go b/test/e2e/apps/cronjob.go index ae9dbcc5d6a..ffd74a0267a 100644 --- a/test/e2e/apps/cronjob.go +++ b/test/e2e/apps/cronjob.go @@ -72,7 +72,7 @@ var _ = SIGDescribe("CronJob", func() { jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) framework.ExpectNoError(err, "Failed to list the CronJobs in namespace %s", f.Namespace.Name) activeJobs, _ := filterActiveJobs(jobs) - gomega.Expect(len(activeJobs) >= 2).To(gomega.BeTrue()) + gomega.Expect(len(activeJobs)).To(gomega.BeNumerically(">=", 2)) ginkgo.By("Removing cronjob") err = deleteCronJob(f.ClientSet, f.Namespace.Name, cronJob.Name) @@ -249,7 +249,7 @@ var _ = SIGDescribe("CronJob", func() { jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists by listing jobs explicitly in namespace %s", f.Namespace.Name) _, finishedJobs := filterActiveJobs(jobs) - gomega.Expect(len(finishedJobs) == 1).To(gomega.BeTrue()) + gomega.Expect(len(finishedJobs)).To(gomega.Equal(1)) // Job should get deleted when the next job finishes the next minute ginkgo.By("Ensuring this job and its pods does not exist anymore") @@ -262,7 +262,7 @@ var _ = SIGDescribe("CronJob", func() { jobs, err = f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) framework.ExpectNoError(err, "Failed to ensure there is one finished job by listing job explicitly in namespace %s", f.Namespace.Name) _, finishedJobs = filterActiveJobs(jobs) - gomega.Expect(len(finishedJobs) == 1).To(gomega.BeTrue()) + gomega.Expect(len(finishedJobs)).To(gomega.Equal(1)) ginkgo.By("Removing cronjob") err = deleteCronJob(f.ClientSet, f.Namespace.Name, cronJob.Name)