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

Merge pull request #19775 from edsantiago/another_kube_play_logs_race

Browse Source 
e2e: fix race condition (kube play + logs)
This commit is contained in:
OpenShift Merge Robot
2023-08-28 18:27:41 +02:00
committed by GitHub
parent dd2ec7c613 2dbb0b0966
commit 5c1760a2b2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/play_build_test.go
View File

@ -350,16 +350,21 @@ echo GOT-HERE
Expect(os.Chdir(yamlDir)).To(Succeed()) Expect(os.Chdir(yamlDir)).To(Succeed())
defer func() { (Expect(os.Chdir(cwd)).To(BeNil())) }() defer func() { (Expect(os.Chdir(cwd)).To(BeNil())) }()
session := podmanTest.Podman([]string{"play", "kube", "echo.yaml"}) session := podmanTest.Podman([]string{"kube", "play", "echo.yaml"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
logs := podmanTest.Podman([]string{"logs", "echo_pod-foobar"}) cid := "echo_pod-foobar"
wait := podmanTest.Podman([]string{"wait", cid})
wait.WaitWithDefaultTimeout()
Expect(wait).To(Exit(0))
logs := podmanTest.Podman([]string{"logs", cid})
logs.WaitWithDefaultTimeout() logs.WaitWithDefaultTimeout()
Expect(logs).Should(Exit(0)) Expect(logs).Should(Exit(0))
Expect(logs.OutputToString()).To(Equal("parenBAR braceBAR dollardollarparenGOT-HERE interpBARolate")) Expect(logs.OutputToString()).To(Equal("parenBAR braceBAR dollardollarparenGOT-HERE interpBARolate"))
inspect := podmanTest.Podman([]string{"container", "inspect", "echo_pod-foobar"}) inspect := podmanTest.Podman([]string{"container", "inspect", cid})
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect).Should(Exit(0)) Expect(inspect).Should(Exit(0))
inspectData := inspect.InspectContainerToJSON() inspectData := inspect.InspectContainerToJSON()