From 73b5dbcd9baddafbe42a02c0e1c34837f41b20f6 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Wed, 21 Dec 2016 11:15:48 -0800
Subject: [PATCH] orphan e2e test should fail if timeout

---
 test/e2e/garbage_collector.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go
index c0064f83f71..a7f3c2feac1 100644
--- a/test/e2e/garbage_collector.go
+++ b/test/e2e/garbage_collector.go
@@ -210,7 +210,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")