From eb8ddc464ae2f33c33049e85295055db33126071 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Wed, 1 Jul 2020 02:46:34 +0000 Subject: [PATCH] Add check on deleteCollection, improve logging --- test/e2e/common/pods.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index 78bb35c7ed4..7dbf6cc8305 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -861,8 +861,9 @@ var _ = framework.KubeDescribe("Pods", func() { framework.ExpectNoError(err, "3 pods not found") // delete Collection of pods with a label in the current namespace - _ = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{ + err = f.ClientSet.CoreV1().Pods(f.Namespace.Name).DeleteCollection(context.TODO(), metav1.DeleteOptions{}, metav1.ListOptions{ LabelSelector: "type=Testing"}) + framework.ExpectNoError(err, "failed to delete collection of pods") fmt.Println("DeleteCollection processed") // wait for all pods to be deleted @@ -878,8 +879,6 @@ func checkPodListQuantity(f *framework.Framework, label string, quantity int) fu return func() (bool, error) { var err error - framework.Logf("requesting list of pods to confirm quantity") - list, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{ LabelSelector: label}) @@ -888,6 +887,7 @@ func checkPodListQuantity(f *framework.Framework, label string, quantity int) fu } if len(list.Items) != quantity { + framework.Logf("Pod quantity %d is different from expected quantity %d", len(list.Items), quantity) return false, err } return true, nil