Merge pull request #17043 from brendandburns/e2e5

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-13 12:00:34 -08:00
commit 5d80d6efec

View File

@ -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() {