From bf58facaef9889458566c820ba27941c73d2de16 Mon Sep 17 00:00:00 2001 From: toyoda Date: Wed, 4 Mar 2020 17:31:50 +0900 Subject: [PATCH] Update waitForPDBCollectionToBeDeleted in e2e test --- test/e2e/apps/disruption.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go index b785218fd61..b1844731f63 100644 --- a/test/e2e/apps/disruption.go +++ b/test/e2e/apps/disruption.go @@ -431,15 +431,17 @@ func deletePDBCollection(cs kubernetes.Interface, ns string) { func waitForPDBCollectionToBeDeleted(cs kubernetes.Interface, ns string) { ginkgo.By("Waiting for the PDB collection to be deleted") - wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) { + err := wait.PollImmediate(framework.Poll, schedulingTimeout, func() (bool, error) { pdbList, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).List(context.TODO(), metav1.ListOptions{}) if err != nil { return false, err } - framework.ExpectNoError(err, "Listing PDB set in namespace %s", ns) - framework.ExpectEqual(len(pdbList.Items), 0, "Expecting No PDBs returned in namespace %s", ns) + if len(pdbList.Items) != 0 { + return false, nil + } return true, nil }) + framework.ExpectNoError(err, "Waiting for the PDB collection to be deleted in namespace %s", ns) } func createPodsOrDie(cs kubernetes.Interface, ns string, n int) {