Merge pull request #23960 from caesarxuchao/fix-23952

fix e2e flake #23952
This commit is contained in:
Chao Xu 2016-04-07 16:59:59 -07:00
commit 1cc84c5525

View File

@ -129,7 +129,9 @@ var _ = KubeDescribe("Generated release_1_2 clientset", func() {
deleted := false
timeout := false
var lastPod *api.Pod
timer := time.After(30 * time.Second)
// The 30s grace period is not an upper-bound of the time it takes to
// delete the pod from etcd.
timer := time.After(60 * time.Second)
for !deleted && !timeout {
select {
case event, _ := <-w.ResultChan():