Merge pull request #5155 from jlowdermilk/e2e

Include seconds waited in e2e/kubectl.go timeout message.
This commit is contained in:
Alex Mohr 2015-03-09 13:44:32 -07:00
commit 0cac9ed2fd

View File

@ -157,7 +157,7 @@ func validateController(c *client.Client, image string, replicas int) {
return
}
}
Failf("Timed out waiting for %s pods to reach valid state", updateDemoSelector)
Failf("Timed out after %d seconds waiting for %s pods to reach valid state", podStartTimeout.Seconds(), updateDemoSelector)
}
type updateDemoData struct {