From 7b913370681993a76bc4bf3670eb13a7146f5cc3 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Thu, 12 Aug 2021 17:44:57 +0200 Subject: [PATCH] e2e_node: eviction: Include names of pending-eviction pods in error --- test/e2e_node/eviction_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index a0389a50492..068b48f0a8e 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -658,6 +658,7 @@ func verifyEvictionOrdering(f *framework.Framework, testSpecs []podEvictSpec) er ginkgo.By("checking eviction ordering and ensuring important pods don't fail") done := true + pendingPods := []string{} for _, priorityPodSpec := range testSpecs { var priorityPod v1.Pod for _, p := range updatedPods { @@ -700,13 +701,14 @@ func verifyEvictionOrdering(f *framework.Framework, testSpecs []podEvictSpec) er // If a pod that is not evictionPriority 0 has not been evicted, we are not done if priorityPodSpec.evictionPriority != 0 && priorityPod.Status.Phase != v1.PodFailed { + pendingPods = append(pendingPods, priorityPod.ObjectMeta.Name) done = false } } if done { return nil } - return fmt.Errorf("pods that should be evicted are still running") + return fmt.Errorf("pods that should be evicted are still running: %#v", pendingPods) } func verifyEvictionEvents(f *framework.Framework, testSpecs []podEvictSpec, expectedStarvedResource v1.ResourceName) {