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

Merge pull request #12744 from kolyshkin/fix-flake

Browse Source 
Fix test flake in test/e2e/pod_initcontainers
This commit is contained in:
OpenShift Merge Robot
2022-01-05 13:50:37 +01:00
committed by GitHub
parent ec9d67b7e4 79c5b73ed7
commit 6902d9d909
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/pod_initcontainers_test.go
View File

@ -135,7 +135,7 @@ var _ = Describe("Podman init containers", func() {
filename := filepath.Join("/dev/shm", RandomString(12)) filename := filepath.Join("/dev/shm", RandomString(12))
// Write the date to a file // Write the date to a file
session := podmanTest.Podman([]string{"create", "--init-ctr", "always", "--pod", "new:foobar", ALPINE, "bin/sh", "-c", fmt.Sprintf("date > %s", filename)}) session := podmanTest.Podman([]string{"create", "--init-ctr", "always", "--pod", "new:foobar", fedoraMinimal, "bin/sh", "-c", "date +%T.%N > " + filename})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
verify := podmanTest.Podman([]string{"create", "--pod", "foobar", "-t", ALPINE, "top"}) verify := podmanTest.Podman([]string{"create", "--pod", "foobar", "-t", ALPINE, "top"})

2
test/e2e/run_test.go
View File

@ -1315,7 +1315,7 @@ USER mail`, BB)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
file.Close() file.Close()
session := podmanTest.Podman([]string{"run", "-dt", "--restart", "always", "-v", fmt.Sprintf("%s:/tmp/runroot:Z", testDir), ALPINE, "sh", "-c", "date +%N > /tmp/runroot/ran && while test -r /tmp/runroot/running; do sleep 0.1s; done"}) session := podmanTest.Podman([]string{"run", "-dt", "--restart", "always", "-v", fmt.Sprintf("%s:/tmp/runroot:Z", testDir), ALPINE, "sh", "-c", "touch /tmp/runroot/ran && while test -r /tmp/runroot/running; do sleep 0.1s; done"})
found := false found := false
testFile := filepath.Join(testDir, "ran") testFile := filepath.Join(testDir, "ran")