Merge pull request #49510 from caesarxuchao/increase-orphan-timeout

Automatic merge from submit-queue

increase the timeout in GC orphan test

Fixes #42086

See the [justification](https://github.com/kubernetes/kubernetes/issues/42086#issuecomment-317521413).
This commit is contained in:
Kubernetes Submit Queue 2017-07-24 15:02:57 -07:00 committed by GitHub
commit 8079b4ab9e

View File

@ -304,9 +304,10 @@ var _ = SIGDescribe("Garbage collector", func() {
// a client is 5. If the qps is saturated, it will take 20s to orphan
// the pods. However, apiserver takes hundreds of ms to finish one
// PATCH, and the gc sends the patching in a single thread, so the
// actual qps is less than 5. According to the test logs, 60s is enough
// time.
if err := wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) {
// actual qps is less than 5. Also, the e2e tests are running in
// parallel, the GC controller might get distracted by other tests.
// According to the test logs, 120s is enough time.
if err := wait.Poll(5*time.Second, 120*time.Second, func() (bool, error) {
rcs, err := rcClient.List(metav1.ListOptions{})
if err != nil {
return false, fmt.Errorf("Failed to list rcs: %v", err)