Commit 46becf2c authored by Jess Frazelle's avatar Jess Frazelle Committed by GitHub

Merge pull request #41157 from dashpole/test_timeout_delete

lengthen pod deletion timeout to prevent flakes
parents bd17091e ab2ce9cd
...@@ -164,7 +164,7 @@ var _ = framework.KubeDescribe("Pods Extended", func() { ...@@ -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():
......
...@@ -35,7 +35,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { ...@@ -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
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment