diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-05 13:50:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-05 13:50:37 +0100 |
| commit | 6902d9d9093e1d977ba733a182969bea3489dfbe (patch) | |
| tree | aa17df86740a5c203fa848afe89faa1fd047533c /test | |
| parent | ec9d67b7e4dc1ee7f289dcb768e9285dd40e0e43 (diff) | |
| parent | 79c5b73ed78b3ccfd0e790b5b5195e55f790226b (diff) | |
| download | podman-6902d9d9093e1d977ba733a182969bea3489dfbe.tar.gz podman-6902d9d9093e1d977ba733a182969bea3489dfbe.tar.bz2 podman-6902d9d9093e1d977ba733a182969bea3489dfbe.zip | |
Merge pull request #12744 from kolyshkin/fix-flake
Fix test flake in test/e2e/pod_initcontainers
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/pod_initcontainers_test.go | 2 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index 11e7ca400..e73f28a7a 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -135,7 +135,7 @@ var _ = Describe("Podman init containers", func() { filename := filepath.Join("/dev/shm", RandomString(12)) // 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() Expect(session).Should(Exit(0)) verify := podmanTest.Podman([]string{"create", "--pod", "foobar", "-t", ALPINE, "top"}) diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 8db23080e..e98f2c999 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1315,7 +1315,7 @@ USER mail`, BB) Expect(err).To(BeNil()) 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 testFile := filepath.Join(testDir, "ran") |