From ef0953585efe361df2b77fc4efdf28798f4b67c2 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Mon, 7 Mar 2016 17:53:49 +0100 Subject: [PATCH] Speed up DeleteRC test util func --- test/e2e/util.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/util.go b/test/e2e/util.go index 9950ae30a5..a010f10184 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -2319,10 +2319,12 @@ func DeleteRC(c *client.Client, ns, name string) error { // waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods // have completed termination). func waitForRCPodsGone(c *client.Client, rc *api.ReplicationController) error { + labels := labels.SelectorFromSet(rc.Spec.Selector) + podStore := newPodStore(c, rc.Namespace, labels, fields.Everything()) + defer podStore.Stop() + return wait.PollImmediate(poll, 2*time.Minute, func() (bool, error) { - selector := labels.SelectorFromSet(rc.Spec.Selector) - options := api.ListOptions{LabelSelector: selector} - if pods, err := c.Pods(rc.Namespace).List(options); err == nil && len(pods.Items) == 0 { + if pods := podStore.List(); len(pods) == 0 { return true, nil } return false, nil