Fix TestWaitForPodSucceeded flake (#3818)

+ Increase the timeout + Better error message Signed-off-by: David Gageot <[email protected]>
GoogleContainerTools · Mar 13, 2020 · 6be2fdf · 6be2fdf
1 parent d72e304
commit 6be2fdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/skaffold/kubernetes/wait.go b/pkg/skaffold/kubernetes/wait.go
@@ -18,7 +18,6 @@ package kubernetes
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -43,7 +42,7 @@ func watchUntilTimeout(ctx context.Context, timeout time.Duration, w watch.Inter
 	for {
 		select {
 		case <-ctx.Done():
-			return errors.New("context closed while waiting for condition")
+			return ctx.Err()
 		case event := <-w.ResultChan():
 			done, err := condition(&event)
 			if err != nil {

diff --git a/pkg/skaffold/kubernetes/wait_test.go b/pkg/skaffold/kubernetes/wait_test.go
@@ -32,17 +32,21 @@ func TestWaitForPodSucceeded(t *testing.T) {
 	tests := []struct {
 		description string
 		phases      []v1.PodPhase
+		timeout     time.Duration
 		shouldErr   bool
 	}{
 		{
 			description: "pod eventually succeeds",
+			timeout:     1 * time.Second,
 			phases:      []v1.PodPhase{v1.PodRunning, v1.PodSucceeded},
 		}, {
 			description: "pod eventually fails",
+			timeout:     1 * time.Second,
 			phases:      []v1.PodPhase{v1.PodRunning, v1.PodFailed},
 			shouldErr:   true,
 		}, {
 			description: "pod times out",
+			timeout:     10 * time.Millisecond,
 			phases:      []v1.PodPhase{v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning, v1.PodRunning},
 			shouldErr:   true,
 		},
@@ -59,7 +63,7 @@ func TestWaitForPodSucceeded(t *testing.T) {
 
 			errChan := make(chan error)
 			go func() {
-				errChan <- WaitForPodSucceeded(context.TODO(), fakePods, "", 10*time.Millisecond)
+				errChan <- WaitForPodSucceeded(context.TODO(), fakePods, "", test.timeout)
 			}()
 
 			for _, phase := range test.phases {