github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Convert waitForPodSuccess to error form, glog->By

Browse Source 
* Also add variable timeout as well
* And nail in coffin for glog in this file!
This commit is contained in:
Zach Loafman
2015-02-09 07:48:07 -08:00
parent ff67052408
commit fe838fca64
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/pods.go
View File

@@ -275,10 +275,8 @@ var _ = Describe("Pods", func() {
}()
// Wait for client pod to complete.
success := waitForPodSuccess(c, clientPod.Name, clientPod.Spec.Containers[0].Name)
if !success {
Fail(fmt.Sprintf("Failed to run client pod to detect service env vars."))
}
err = waitForPodSuccess(c, clientPod.Name, clientPod.Spec.Containers[0].Name, 60*time.Second)
Expect(err).NotTo(HaveOccurred())
// Grab its logs. Get host first.
clientPodStatus, err := c.Pods(api.NamespaceDefault).Get(clientPod.Name)