Commit 455fe823 authored by Piotr Szczesniak's avatar Piotr Szczesniak

Merge pull request #5912 from fgrzadkowski/fix_integration

Fix race in integration test
parents c8e89bc7 0804a5c8
...@@ -308,10 +308,12 @@ func podRunning(c *client.Client, podNamespace string, podID string) wait.Condit ...@@ -308,10 +308,12 @@ func podRunning(c *client.Client, podNamespace string, podID string) wait.Condit
return false, nil return false, nil
} }
if err != 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 { 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 return true, nil
} }
......
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