From 0804a5c8234496ce388647e63cef0eb57deab590 Mon Sep 17 00:00:00 2001 From: Filip Grzadkowski Date: Wed, 25 Mar 2015 14:22:24 +0100 Subject: [PATCH] Fix race in integration test --- cmd/integration/integration.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 54b54f6e1f4..f0d832513af 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -308,10 +308,12 @@ func podRunning(c *client.Client, podNamespace string, podID string) wait.Condit return false, nil } if err != nil { - return false, err + // This could be a connection error so we want to retry, but log the error. + glog.Errorf("Error when reading pod %q: %v", podID, err) + return false, nil } if pod.Status.Phase != api.PodRunning { - return false, errors.New(fmt.Sprintf("Pod status is %q", pod.Status.Phase)) + return false, nil } return true, nil }