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

Add a timeout to waitForPodRunning

Browse Source 
* Add a timeout, convert the function to return an error (which gives
a reasonable status message for callers).
* Start converting glog to By.
This commit is contained in:
Zach Loafman
2015-02-08 07:57:48 -08:00
parent c9c98ab19e
commit 2be3139926
5 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/pods.go
View File

@@ -145,7 +145,8 @@ var _ = Describe("Pods", func() {
}()
By("waiting for the pod to start running")
waitForPodRunning(c, pod.Name)
err = waitForPodRunning(c, pod.Name, 300*time.Second)
Expect(err).NotTo(HaveOccurred())
By("verifying the pod is in kubernetes")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
@@ -168,7 +169,8 @@ var _ = Describe("Pods", func() {
}
By("waiting for the updated pod to start running")
waitForPodRunning(c, pod.Name)
err = waitForPodRunning(c, pod.Name, 300*time.Second)
Expect(err).NotTo(HaveOccurred())
By("verifying the updated pod is in kubernetes")
pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
@@ -203,7 +205,8 @@ var _ = Describe("Pods", func() {
defer GinkgoRecover()
c.Pods(api.NamespaceDefault).Delete(serverPod.Name)
}()
waitForPodRunning(c, serverPod.Name)
err = waitForPodRunning(c, serverPod.Name, 300*time.Second)
Expect(err).NotTo(HaveOccurred())
// This service exposes port 8080 of the test pod as a service on port 8765
// TODO(filbranden): We would like to use a unique service name such as: