Merge pull request #39096 from caesarxuchao/fix-gc-e2e-test

Automatic merge from submit-queue

e2e test should fail if err==timeout

If err==timeout, it means the replicaset (the owner) is not deleted after 30s, which indicates a bug, so the e2e test should fail.
This commit is contained in:
Kubernetes Submit Queue 2017-01-31 08:44:35 -08:00 committed by GitHub
commit de2493e733

View File

@ -263,7 +263,7 @@ var _ = framework.KubeDescribe("Garbage collector", func() {
return false, nil return false, nil
} }
return true, nil return true, nil
}); err != nil && err != wait.ErrWaitTimeout { }); err != nil {
framework.Failf("%v", err) framework.Failf("%v", err)
} }
By("wait for 30 seconds to see if the garbage collector mistakenly deletes the pods") By("wait for 30 seconds to see if the garbage collector mistakenly deletes the pods")