From 21f6902ec3109a96a89a6206106d547d7255d44b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 14 Nov 2022 13:09:45 -0700 Subject: [PATCH] Fix more podman-logs flakes No issue filed, because I thought these were related to 16132. They're not: they're actual test bugs, running "play kube" without actually waiting for the container to run. Fix that. Signed-off-by: Ed Santiago --- test/e2e/play_kube_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 557526191d..7fbc9305fc 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1784,6 +1784,10 @@ var _ = Describe("Podman play kube", func() { kube.WaitWithDefaultTimeout() Expect(kube).Should(Exit(0)) + wait := podmanTest.Podman([]string{"wait", getCtrNameInPod(p)}) + wait.WaitWithDefaultTimeout() + Expect(wait).Should(Exit(0)) + logs := podmanTest.Podman([]string{"logs", getCtrNameInPod(p)}) logs.WaitWithDefaultTimeout() Expect(logs).Should(Exit(0)) @@ -1801,6 +1805,10 @@ var _ = Describe("Podman play kube", func() { kube.WaitWithDefaultTimeout() Expect(kube).Should(Exit(0)) + wait := podmanTest.Podman([]string{"wait", getCtrNameInPod(p)}) + wait.WaitWithDefaultTimeout() + Expect(wait).Should(Exit(0)) + logs := podmanTest.Podman([]string{"pod", "logs", p.Name}) logs.WaitWithDefaultTimeout() Expect(logs).Should(Exit(0)) @@ -1818,6 +1826,10 @@ var _ = Describe("Podman play kube", func() { kube.WaitWithDefaultTimeout() Expect(kube).Should(Exit(0)) + wait := podmanTest.Podman([]string{"wait", getCtrNameInPod(p)}) + wait.WaitWithDefaultTimeout() + Expect(wait).Should(Exit(0)) + logs := podmanTest.Podman([]string{"pod", "logs", "-c", getCtrNameInPod(p), p.Name}) logs.WaitWithDefaultTimeout() Expect(logs).Should(Exit(0))