opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 03:08:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18533 from edsantiago/fix_logtest_flake

Browse Source 
e2e: logs test: fix flakes
This commit is contained in:
OpenShift Merge Robot
2023-05-10 08:28:38 -04:00
committed by GitHub
parent c307aeba37 14001ad48a
commit ad7d034025
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/logs_test.go
View File

@ -566,11 +566,11 @@ var _ = Describe("Podman logs", func() {
testPod.WaitWithDefaultTimeout() testPod.WaitWithDefaultTimeout()
Expect(testPod).To(Exit(0)) 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() log1.WaitWithDefaultTimeout()
Expect(log1).To(Exit(0)) 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() log2.WaitWithDefaultTimeout()
Expect(log2).To(Exit(0)) 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 := podmanTest.Podman([]string{"pod", "create", fmt.Sprintf("--name=%s", podName)})
testPod.WaitWithDefaultTimeout() testPod.WaitWithDefaultTimeout()
Expect(testPod).To(Exit(0)) 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() log1.WaitWithDefaultTimeout()
Expect(log1).To(Exit(0)) 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() log2.WaitWithDefaultTimeout()
Expect(log2).To(Exit(0)) Expect(log2).To(Exit(0))
results := podmanTest.Podman([]string{"pod", "logs", "--color", podName}) results := podmanTest.Podman([]string{"pod", "logs", "--color", podName})