github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix race in integration test

Browse Source
This commit is contained in:
Filip Grzadkowski 2015-03-25 14:22:24 +01:00
parent 012ba0e3b0
commit 0804a5c823
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/integration/integration.go
View File

@ -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
} }