Merge pull request #42069 from smarterclayton/fix_pod_timeout

Automatic merge from submit-queue (batch tested with PRs 42106, 42094, 42069, 42098, 41852) Pod deletion observation is flaking, increase timeout and debug more We can afford to wait longer than 30 seconds, and we should be printing more error and output information about the cause of the failure. Fixes / triages #41902

Merge pull request #42069 from smarterclayton/fix_pod_timeout
ece8b674 · Kubernetes Submit Queue · GitHub · cb17b636 · 3f04421d · ece8b674
Commit ece8b674 authored Feb 26, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 26, 2017
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

pods.go test/e2e/common/pods.go +8 -5

No files found.
--- a/test/e2e/common/pods.go
+++ b/test/e2e/common/pods.go
@@ -233,18 +233,21 @@ var _ = framework.KubeDescribe("Pods", func() {
 		By("verifying pod deletion was observed")
 		deleted := false
-		timeout := false
 		var lastPod *v1.Pod
-		timer := time.After(30 * time.Second)
+		timer := time.After(2 * time.Minute)
-		for !deleted && !timeout {
+		for !deleted {
 			select {
 			case event, _ := <-w.ResultChan():
-				if event.Type == watch.Deleted {
+				switch event.Type {
+				case watch.Deleted:
 					lastPod = event.Object.(*v1.Pod)
 					deleted = true
+				case watch.Error:
+					framework.Logf("received a watch error: %v", event.Object)
+					Fail("watch closed with error")
 				}
 			case <-timer:
-				timeout = true
+				Fail("timed out waiting for pod deletion")
 			}
 		}
 		if !deleted {