From 364c6f11733467ab100da99a578fa3fc7eabfac2 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Sat, 8 Feb 2020 16:47:12 +0800 Subject: [PATCH] remove TODO and unused code --- test/e2e/framework/pod/wait.go | 6 +----- test/e2e/framework/util.go | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/test/e2e/framework/pod/wait.go b/test/e2e/framework/pod/wait.go index cff32a8b734..f0c92709b82 100644 --- a/test/e2e/framework/pod/wait.go +++ b/test/e2e/framework/pod/wait.go @@ -53,14 +53,10 @@ const ( podScheduledBeforeTimeout = podListTimeout + (20 * time.Second) // podStartTimeout is how long to wait for the pod to be started. - // 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 // poll is how often to poll pods, nodes and claims. - poll = 2 * time.Second - pollShortTimeout = 1 * time.Minute - pollLongTimeout = 5 * time.Minute + poll = 2 * time.Second // singleCallTimeout is how long to try single API calls (like 'get' or 'list'). Used to prevent // transient failures from failing tests. diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index c1b48836da0..04ca476219e 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -87,8 +87,6 @@ const ( // PodListTimeout is how long to wait for the pod to be listable. PodListTimeout = time.Minute // PodStartTimeout is how long to wait for the pod to be started. - // 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 // PodStartShortTimeout is same as `PodStartTimeout` to wait for the pod to be started, but shorter.