From 79d26997a255cb8a4b9800a8c78ec98c98665f8b Mon Sep 17 00:00:00 2001 From: jayunit100 Date: Sun, 26 Apr 2015 18:54:10 -0400 Subject: [PATCH] E2E: FIX util.go testContainerOutputInNamespace to properly check the namespace. --- test/e2e/util.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/util.go b/test/e2e/util.go index 75458408c80..47e4c94af7d 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -86,7 +86,7 @@ func waitForPodCondition(c *client.Client, ns, podName, desc string, condition p for start := time.Now(); time.Since(start) < podStartTimeout; time.Sleep(5 * time.Second) { pod, err := c.Pods(ns).Get(podName) if err != nil { - Logf("Get pod failed, ignoring for 5s: %v", err) + Logf("Get pod %v in ns %v failed, ignoring for 5s: %v", podName, ns, err) continue } done, err := condition(pod) @@ -367,7 +367,7 @@ func testContainerOutputInNamespace(ns, scenarioName string, c *client.Client, p containerName := pod.Spec.Containers[0].Name // Wait for client pod to complete. - expectNoError(waitForPodSuccess(c, pod.Name, containerName)) + expectNoError(waitForPodSuccessInNamespace(c, pod.Name, containerName, ns)) // Grab its logs. Get host first. podStatus, err := c.Pods(ns).Get(pod.Name)