Merge pull request #15166 from sstosh/ci-mount-rootless

Cirrus: Fix e2e tests for "mount_rootless_test"

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"))
 	})
 })