diff options
| author | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-08-03 14:39:38 +0900 |
|---|---|---|
| committer | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-08-03 17:01:18 +0900 |
| commit | 1dbd61653d5538ef364f7b325be789eb9be4da68 (patch) | |
| tree | 0388e3e70d497639af6f26dfe901eb81a8348b44 /test | |
| parent | c09457e34a429622475e27fe68e17effe47fe0c3 (diff) | |
| download | podman-1dbd61653d5538ef364f7b325be789eb9be4da68.tar.gz podman-1dbd61653d5538ef364f7b325be789eb9be4da68.tar.bz2 podman-1dbd61653d5538ef364f7b325be789eb9be4da68.zip | |
Cirrus: Fix e2e tests for "mount_rootless_test"
e2e `mount_rootless_test` did not load `podman binary path` successfully.
This PR fix this problem.
[It] podman unshare podman mount:
```
[+1596s] Running: ... unshare mount <cid>
[+1596s] Error: exec: no command
[+1596s] output:
```
[It] podman unshare image podman mount:
```
[+1599s] Running: ... unshare image mount quay.io/libpod/alpine:latest
[+1599s] Error: exec: no command
[+1599s] output:
```
Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/mount_rootless_test.go | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index 994a5899b..b0452deda 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -52,9 +52,16 @@ var _ = Describe("Podman mount", func() { Expect(setup).Should(Exit(0)) cid := setup.OutputToString() - session := podmanTest.Podman([]string{"unshare", PODMAN_BINARY, "mount", cid}) + // command: podman <options> unshare podman <options> mount cid + args := []string{"unshare", podmanTest.PodmanBinary} + opts := podmanTest.PodmanMakeOptions([]string{"mount", cid}, false, false) + args = append(args, opts...) + + // container root file system location is /tmp/... because "--root /tmp/..." + session := podmanTest.Podman(args) session.WaitWithDefaultTimeout() - Expect(setup).Should(Exit(0)) + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).To(ContainSubstring("/tmp")) }) It("podman image mount", func() { @@ -71,8 +78,15 @@ var _ = Describe("Podman mount", func() { setup.WaitWithDefaultTimeout() Expect(setup).Should(Exit(0)) - session := podmanTest.Podman([]string{"unshare", PODMAN_BINARY, "image", "mount", ALPINE}) + // command: podman <options> unshare podman <options> image mount ALPINE + args := []string{"unshare", podmanTest.PodmanBinary} + opts := podmanTest.PodmanMakeOptions([]string{"image", "mount", ALPINE}, false, false) + args = append(args, opts...) + + // image location is /tmp/... because "--root /tmp/..." + session := podmanTest.Podman(args) session.WaitWithDefaultTimeout() - Expect(setup).Should(Exit(0)) + Expect(session).Should(Exit(0)) + Expect(session.OutputToString()).To(ContainSubstring("/tmp")) }) }) |