From 1d4218e6b8d0ae5dd1234e3382dd467a81c64ad4 Mon Sep 17 00:00:00 2001 From: AiRanthem Date: Fri, 8 Aug 2025 17:13:24 +0800 Subject: [PATCH] E2E tests occasionally fail due to pods failing to be created. Optimize the related test code to get more information. Signed-off-by: AiRanthem --- test/e2e/rollout_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/e2e/rollout_test.go b/test/e2e/rollout_test.go index 3cb4124f..9d37fcc7 100644 --- a/test/e2e/rollout_test.go +++ b/test/e2e/rollout_test.go @@ -221,12 +221,14 @@ var _ = SIGDescribe("Rollout", func() { } WaitDeploymentAllPodsReady := func(deployment *apps.Deployment) { - Eventually(func() bool { + Eventually(func(g Gomega) { clone := &apps.Deployment{} - Expect(GetObject(deployment.Name, clone)).NotTo(HaveOccurred()) - return clone.Status.ObservedGeneration == clone.Generation && *clone.Spec.Replicas == clone.Status.UpdatedReplicas && - *clone.Spec.Replicas == clone.Status.ReadyReplicas && *clone.Spec.Replicas == clone.Status.Replicas - }, 5*time.Minute, time.Second).Should(BeTrue()) + g.Expect(GetObject(deployment.Name, clone)).NotTo(HaveOccurred()) + g.Expect(clone.Generation).To(Equal(clone.Status.ObservedGeneration)) + g.Expect(clone.Status.UpdatedReplicas).To(Equal(*clone.Spec.Replicas)) + g.Expect(clone.Status.ReadyReplicas).To(Equal(*clone.Spec.Replicas)) + g.Expect(clone.Status.Replicas).To(Equal(*clone.Spec.Replicas)) + }).WithPolling(time.Second).WithTimeout(5 * time.Minute).Should(Succeed()) } WaitCloneSetAllPodsReady := func(cloneset *appsv1alpha1.CloneSet) {