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.

Merge pull request #39096 from caesarxuchao/fix-gc-e2e-test
de2493e7 · Kubernetes Submit Queue · GitHub · a2b65f03 · 73b5dbcd · de2493e7
Commit de2493e7 authored Jan 31, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

garbage_collector.go test/e2e/garbage_collector.go +1 -1

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