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.
parent ee88325f
...@@ -233,18 +233,21 @@ var _ = framework.KubeDescribe("Pods", func() { ...@@ -233,18 +233,21 @@ var _ = framework.KubeDescribe("Pods", func() {
By("verifying pod deletion was observed") By("verifying pod deletion was observed")
deleted := false deleted := false
timeout := false
var lastPod *v1.Pod var lastPod *v1.Pod
timer := time.After(30 * time.Second) timer := time.After(2 * time.Minute)
for !deleted && !timeout { for !deleted {
select { select {
case event, _ := <-w.ResultChan(): case event, _ := <-w.ResultChan():
if event.Type == watch.Deleted { switch event.Type {
case watch.Deleted:
lastPod = event.Object.(*v1.Pod) lastPod = event.Object.(*v1.Pod)
deleted = true deleted = true
case watch.Error:
framework.Logf("received a watch error: %v", event.Object)
Fail("watch closed with error")
} }
case <-timer: case <-timer:
timeout = true Fail("timed out waiting for pod deletion")
} }
} }
if !deleted { if !deleted {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment