Merge pull request #41157 from dashpole/test_timeout_delete

lengthen pod deletion timeout to prevent flakes
This commit is contained in:
Jess Frazelle 2017-02-08 18:01:32 -08:00 committed by GitHub
commit 46becf2c81
2 changed files with 2 additions and 2 deletions

View File

@ -164,7 +164,7 @@ var _ = framework.KubeDescribe("Pods Extended", func() {
deleted := false deleted := false
timeout := false timeout := false
var lastPod *v1.Pod var lastPod *v1.Pod
timer := time.After(30 * time.Second) timer := time.After(1 * time.Minute)
for !deleted && !timeout { for !deleted && !timeout {
select { select {
case event, _ := <-w.ResultChan(): case event, _ := <-w.ResultChan():

View File

@ -35,7 +35,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() {
var podClient *framework.PodClient var podClient *framework.PodClient
const ( const (
podCheckInterval = 1 * time.Second podCheckInterval = 1 * time.Second
podWaitTimeout = 2 * time.Minute podWaitTimeout = 3 * time.Minute
postStartWaitTimeout = 2 * time.Minute postStartWaitTimeout = 2 * time.Minute
preStopWaitTimeout = 30 * time.Second preStopWaitTimeout = 30 * time.Second
) )