Merge pull request #5134 from jlowdermilk/e2e

fix Errorf argument mismatch in test/e2e/util.go
This commit is contained in:
roberthbailey 2015-03-06 10:21:44 -08:00
commit 0d6b57ccdb

View File

@ -72,7 +72,7 @@ func waitForPodCondition(c *client.Client, ns, podName, desc string, condition p
}
Logf("Waiting for pod %s status to be %q (found %q) (%d secs)", podName, api.PodRunning, pod.Status.Phase, time.Since(start).Seconds())
}
return fmt.Errorf("gave up waiting for pod %s to be %s after %v", podName, podStartTimeout)
return fmt.Errorf("gave up waiting for pod %s to be %s after %v", podName, desc, podStartTimeout)
}
func waitForPodRunning(c *client.Client, podName string) error {