From 14001ad48a0d75609f9a7bfb54cf3038a7fc659b Mon Sep 17 00:00:00 2001 From: Ed Santiago <santiago@redhat.com> Date: Wed, 10 May 2023 04:53:44 -0600 Subject: [PATCH] e2e: logs test: fix flakes Yet another case of missing podman-wait. In these two, I see no reason to run containers detached, so I just removed "-d" Signed-off-by: Ed Santiago <santiago@redhat.com> --- test/e2e/logs_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 985678f3d9..9dcc953e0b 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -566,11 +566,11 @@ var _ = Describe("Podman logs", func() { testPod.WaitWithDefaultTimeout() Expect(testPod).To(Exit(0)) - log1 := podmanTest.Podman([]string{"run", "--name", containerName1, "-d", "--pod", podName, BB, "/bin/sh", "-c", "echo log1"}) + log1 := podmanTest.Podman([]string{"run", "--name", containerName1, "--pod", podName, BB, "/bin/sh", "-c", "echo log1"}) log1.WaitWithDefaultTimeout() Expect(log1).To(Exit(0)) - log2 := podmanTest.Podman([]string{"run", "--name", containerName2, "-d", "--pod", podName, BB, "/bin/sh", "-c", "echo log2"}) + log2 := podmanTest.Podman([]string{"run", "--name", containerName2, "--pod", podName, BB, "/bin/sh", "-c", "echo log2"}) log2.WaitWithDefaultTimeout() Expect(log2).To(Exit(0)) @@ -591,10 +591,10 @@ var _ = Describe("Podman logs", func() { testPod := podmanTest.Podman([]string{"pod", "create", fmt.Sprintf("--name=%s", podName)}) testPod.WaitWithDefaultTimeout() Expect(testPod).To(Exit(0)) - log1 := podmanTest.Podman([]string{"run", "--name", containerName1, "-d", "--pod", podName, BB, "/bin/sh", "-c", "echo log1"}) + log1 := podmanTest.Podman([]string{"run", "--name", containerName1, "--pod", podName, BB, "/bin/sh", "-c", "echo log1"}) log1.WaitWithDefaultTimeout() Expect(log1).To(Exit(0)) - log2 := podmanTest.Podman([]string{"run", "--name", containerName2, "-d", "--pod", podName, BB, "/bin/sh", "-c", "echo log2"}) + log2 := podmanTest.Podman([]string{"run", "--name", containerName2, "--pod", podName, BB, "/bin/sh", "-c", "echo log2"}) log2.WaitWithDefaultTimeout() Expect(log2).To(Exit(0)) results := podmanTest.Podman([]string{"pod", "logs", "--color", podName})