github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5912 from fgrzadkowski/fix_integration

Browse Source 
Fix race in integration test
This commit is contained in:
Piotr Szczesniak 2015-03-25 15:06:31 +01:00
commit 455fe8235b
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
} }