From 0beaea0af7df81d5a55fec5acd893b2abec45f47 Mon Sep 17 00:00:00 2001 From: gmarek Date: Mon, 23 Nov 2015 21:46:23 +0100 Subject: [PATCH] ResizeNodes test wait for the number of system Pods equal to the one observed before the test --- test/e2e/resize_nodes.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 6a2e708424..96e4bbf16e 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -388,12 +388,16 @@ func performTemporaryNetworkFailure(c *client.Client, ns, rcName string, replica var _ = Describe("Nodes", func() { framework := NewFramework("resize-nodes") + var systemPodsNo int var c *client.Client var ns string BeforeEach(func() { c = framework.Client ns = framework.Namespace.Name + systemPods, err := c.Pods(api.NamespaceSystem).List(labels.Everything(), fields.Everything()) + Expect(err).NotTo(HaveOccurred()) + systemPodsNo = len(systemPods.Items) }) Describe("Resize", func() { @@ -424,10 +428,8 @@ var _ = Describe("Nodes", func() { // Many e2e tests assume that the cluster is fully healthy before they start. Wait until // the cluster is restored to health. By("waiting for system pods to successfully restart") - pods, err := framework.Client.Pods(api.NamespaceSystem).List(labels.Everything(), fields.Everything()) - Expect(err).NotTo(HaveOccurred()) - err = waitForPodsRunningReady(api.NamespaceSystem, len(pods.Items), podReadyBeforeTimeout) + err := waitForPodsRunningReady(api.NamespaceSystem, systemPodsNo, podReadyBeforeTimeout) Expect(err).NotTo(HaveOccurred()) })