Merge pull request #26155 from kubernetes/sttts-flake-26126

Flake 26126: use framework.podStartTimeout for kubectl e2e test pod launch
This commit is contained in:
Alex Mohr 2016-05-25 22:20:56 -07:00
commit e3404d32ff

View File

@ -168,7 +168,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
// test files.
// Print debug info if atLeast Pods are not found before the timeout
waitForOrFailWithDebug := func(atLeast int) {
pods, err := clusterState().WaitFor(atLeast, 90*time.Second)
pods, err := clusterState().WaitFor(atLeast, framework.PodStartTimeout)
if err != nil || len(pods) < atLeast {
// TODO: Generalize integrating debug info into these tests so we always get debug info when we need it
framework.DumpAllNamespaceInfo(c, ns)