From f8de9abf286743b64f19c0139e3d008f66538f81 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 1 Nov 2016 10:35:34 -0700 Subject: [PATCH] Disruption e2e: wait for running pods in the table test, too --- test/e2e/disruption.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index be165663776..8001f3b2ad1 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -163,6 +163,11 @@ var _ = framework.KubeDescribe("DisruptionController", func() { err = cs.Pods(ns).Evict(e) Expect(err).Should(MatchError("Cannot evict pod as it would violate the pod's disruption budget.")) } else { + // Only wait for running pods in the "allow" case + // because one of shouldDeny cases relies on the + // replicaSet not fitting on the cluster. + waitForPodsOrDie(cs, ns, c.podCount+int(c.replicaSetSize)) + // Since disruptionAllowed starts out false, if an eviction is ever allowed, // that means the controller is working. err = wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {