From d538ad69c56cd2e39afd2aa8aab154e62237602b Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 9 Nov 2015 20:50:40 -0800 Subject: [PATCH] Add kube-system removal to the resize nodes test --- test/e2e/resize_nodes.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index c532e4dc379..a6677b0650b 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -421,6 +421,14 @@ var _ = Describe("Nodes", func() { if err := waitForClusterSize(c, testContext.CloudConfig.NumNodes, 10*time.Minute); err != nil { Failf("Couldn't restore the original cluster size: %v", err) } + // 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) + Expect(err).NotTo(HaveOccurred()) }) It("should be able to delete nodes", func() {