stabilization of Network.should survive network partition

This commit is contained in:
Marek Biskup
2015-06-18 13:18:21 +02:00
parent 1ba909098e
commit a02752ad12
2 changed files with 145 additions and 43 deletions

View File

@@ -378,6 +378,7 @@ func createTestingNS(baseName string, c *client.Client) (*api.Namespace, error)
func waitForPodRunningInNamespace(c *client.Client, podName string, namespace string) error {
return waitForPodCondition(c, namespace, podName, "running", podStartTimeout, func(pod *api.Pod) (bool, error) {
if pod.Status.Phase == api.PodRunning {
Logf("Found pod '%s' on node '%s'", podName, pod.Spec.NodeName)
return true, nil
}
if pod.Status.Phase == api.PodFailed {