Make e2e pod start timeouts uniform

2015-03-05 12:04:00 -08:00
parent 2c286fea4c
commit 083f29158f
8 changed files with 59 additions and 76 deletions
--- a/test/e2e/events.go
+++ b/test/e2e/events.go
@@ -79,9 +79,7 @@ var _ = Describe("Events", func() {
 			Failf("Failed to create pod: %v", err)
 		}

-		By("waiting for the pod to start running")
-		err := waitForPodRunning(c, pod.Name, 300*time.Second)
-		Expect(err).NotTo(HaveOccurred())
+		expectNoError(waitForPodRunning(c, pod.Name))

 		By("verifying the pod is in kubernetes")
 		pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))