Skip to content

Commit

Permalink
Merge pull request kubernetes#17043 from brendandburns/e2e5
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Nov 13, 2015
2 parents 6a34b2c + d538ad6 commit 5d80d6e
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/e2e/resize_nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,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() {
Expand Down

0 comments on commit 5d80d6e

Please sign in to comment.