github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

E2E: FIX util.go testContainerOutputInNamespace to properly check the namespace.

pull/6/head
jayunit100 2015-04-26 18:54:10 -04:00
parent e061043cf1
commit 79d26997a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/util.go
View File

@ -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) { for start := time.Now(); time.Since(start) < podStartTimeout; time.Sleep(5 * time.Second) {
pod, err := c.Pods(ns).Get(podName) pod, err := c.Pods(ns).Get(podName)
if err != nil { 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 continue
} }
done, err := condition(pod) done, err := condition(pod)
@ -367,7 +367,7 @@ func testContainerOutputInNamespace(ns, scenarioName string, c *client.Client, p
containerName := pod.Spec.Containers[0].Name containerName := pod.Spec.Containers[0].Name
// Wait for client pod to complete. // 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. // Grab its logs. Get host first.
podStatus, err := c.Pods(ns).Get(pod.Name) podStatus, err := c.Pods(ns).Get(pod.Name)