From 93c755bc33e63c020873b385f957c846062f76b4 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Mon, 16 Mar 2026 15:04:08 +0800 Subject: [PATCH 1/2] e2e_node: fix pod StartTime assertion to compare using Equal --- test/e2e_node/standalone_test.go | 2 +- test/e2e_node/static_pod_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/standalone_test.go b/test/e2e_node/standalone_test.go index 0277357fc24..3e095a4a166 100644 --- a/test/e2e_node/standalone_test.go +++ b/test/e2e_node/standalone_test.go @@ -394,7 +394,7 @@ var _ = SIGDescribe(feature.StandaloneMode, func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := getPodFromStandaloneKubelet(ctx, staticPod.Namespace, staticPod.Name) - g.Expect(pod.Status.StartTime).NotTo(gomega.Equal(startTime)) + g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0] diff --git a/test/e2e_node/static_pod_test.go b/test/e2e_node/static_pod_test.go index 0bce3f672af..118c0d422da 100644 --- a/test/e2e_node/static_pod_test.go +++ b/test/e2e_node/static_pod_test.go @@ -103,7 +103,7 @@ var _ = SIGDescribe("StaticPod", framework.WithSerial(), func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := f.ClientSet.CoreV1().Pods(staticPod.Namespace).Get(ctx, mirrorPodName, metav1.GetOptions{}) - g.Expect(pod.Status.StartTime).NotTo(gomega.Equal(startTime)) + g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0] @@ -181,7 +181,7 @@ var _ = SIGDescribe("StaticPod", framework.WithSerial(), func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := f.ClientSet.CoreV1().Pods(staticPod.Namespace).Get(ctx, mirrorPodName, metav1.GetOptions{}) - g.Expect(pod.Status.StartTime).NotTo(gomega.Equal(startTime)) + g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0] From 593c6deea55440bb68b10a20aa8ddcea467d3e90 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Wed, 18 Mar 2026 10:06:59 +0800 Subject: [PATCH 2/2] fix mirror pod starttime failing message --- test/e2e_node/standalone_test.go | 2 +- test/e2e_node/static_pod_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e_node/standalone_test.go b/test/e2e_node/standalone_test.go index 3e095a4a166..94f47c08ea1 100644 --- a/test/e2e_node/standalone_test.go +++ b/test/e2e_node/standalone_test.go @@ -394,7 +394,7 @@ var _ = SIGDescribe(feature.StandaloneMode, func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := getPodFromStandaloneKubelet(ctx, staticPod.Namespace, staticPod.Name) - g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) + g.Expect(pod.Status.StartTime.Equal(startTime)).To(gomega.BeFalseBecause("startTime should not be equal")) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0] diff --git a/test/e2e_node/static_pod_test.go b/test/e2e_node/static_pod_test.go index 118c0d422da..7a6e62438ba 100644 --- a/test/e2e_node/static_pod_test.go +++ b/test/e2e_node/static_pod_test.go @@ -103,7 +103,7 @@ var _ = SIGDescribe("StaticPod", framework.WithSerial(), func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := f.ClientSet.CoreV1().Pods(staticPod.Namespace).Get(ctx, mirrorPodName, metav1.GetOptions{}) - g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) + g.Expect(pod.Status.StartTime.Equal(startTime)).To(gomega.BeFalseBecause("startTime should not be equal")) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0] @@ -181,7 +181,7 @@ var _ = SIGDescribe("StaticPod", framework.WithSerial(), func() { ginkgo.By("wait for the mirror pod to be updated") gomega.Eventually(ctx, func(g gomega.Gomega) { pod, err := f.ClientSet.CoreV1().Pods(staticPod.Namespace).Get(ctx, mirrorPodName, metav1.GetOptions{}) - g.Expect(pod.Status.StartTime.Equal(startTime), fmt.Sprintf("startTime: %v, expected: %v", pod.Status.StartTime, startTime)).To(gomega.BeFalse()) + g.Expect(pod.Status.StartTime.Equal(startTime)).To(gomega.BeFalseBecause("startTime should not be equal")) g.Expect(err).Should(gomega.Succeed()) g.Expect(pod.Status.InitContainerStatuses).To(gomega.HaveLen(1)) cstatus := pod.Status.InitContainerStatuses[0]