From 4b0c0bd9248e5f0fbd8455b0529ef45a519f240f Mon Sep 17 00:00:00 2001
From: Maciej Szulik <maszulik@redhat.com>
Date: Tue, 12 Jul 2016 11:48:39 +0200
Subject: [PATCH] Shorten initial pod start time to 30s in e2e, since 4566 is
 closed

---
 test/e2e/framework/util.go | 3 +--
 test/e2e/pods.go           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
index 64fbbd62a37..a48c72c338a 100644
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -86,8 +86,7 @@ const (
 	// How long to wait for the pod to be listable
 	PodListTimeout = time.Minute
 	// Initial pod start can be delayed O(minutes) by slow docker pulls
-	// TODO: Make this 30 seconds once #4566 is resolved.
-	PodStartTimeout = 5 * time.Minute
+	PodStartTimeout = 30 * time.Second
 
 	// How long to wait for the pod to no longer be running
 	podNoLongerRunningTimeout = 30 * time.Second
diff --git a/test/e2e/pods.go b/test/e2e/pods.go
index e627fa7a532..40be2f48320 100644
--- a/test/e2e/pods.go
+++ b/test/e2e/pods.go
@@ -815,7 +815,7 @@ var _ = framework.KubeDescribe("Pods", func() {
 
 		wr := watch.NewRecorder(w)
 		event, err := watch.Until(
-			framework.PodStartTimeout, wr,
+			framework.PodReadyBeforeTimeout, wr,
 			// check for the first container to fail at least once
 			func(evt watch.Event) (bool, error) {
 				switch t := evt.Object.(type) {