summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-11-23 06:32:36 -0700
committerEd Santiago <santiago@redhat.com>2021-11-23 13:50:35 -0700
commitcd59721de13e388bac706576057dc42c0853484d (patch)
treef19930072101cd1cb15d6aab7e071bf9ad54181a /test
parent1be4c36e7ecbe05333e13320ea1e194b0c41b539 (diff)
downloadpodman-cd59721de13e388bac706576057dc42c0853484d.tar.gz
podman-cd59721de13e388bac706576057dc42c0853484d.tar.bz2
podman-cd59721de13e388bac706576057dc42c0853484d.zip
e2e test cleanup, continued
Continue eliminating GrepString() and BeTrue(), in tiny incremental steps. Here I take the liberty of refactoring some hard-to-read code by adding a helper. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/pod_create_test.go6
-rw-r--r--test/e2e/run_volume_test.go70
2 files changed, 29 insertions, 47 deletions
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index 820b13a17..a3dde3650 100644
--- a/test/e2e/pod_create_test.go
+++ b/test/e2e/pod_create_test.go
@@ -756,7 +756,7 @@ ENTRYPOINT ["sleep","99999"]
session := podmanTest.Podman([]string{"run", "--pod", podName, ALPINE, "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- ok, _ := session.GrepString("500")
+ Expect(session.OutputToString()).To(ContainSubstring("500"))
podName = "testPod-1"
podCreate = podmanTest.Podman([]string{"pod", "create", "--userns=auto:size=3000", "--name", podName})
@@ -765,9 +765,7 @@ ENTRYPOINT ["sleep","99999"]
session = podmanTest.Podman([]string{"run", "--pod", podName, ALPINE, "cat", "/proc/self/uid_map"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- ok, _ = session.GrepString("3000")
-
- Expect(ok).To(BeTrue())
+ Expect(session.OutputToString()).To(ContainSubstring("3000"))
})
It("podman pod create --userns=auto:uidmapping=", func() {
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 0de2dbd65..967cf4a7c 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -43,50 +43,38 @@ var _ = Describe("Podman run with volumes", func() {
processTestResult(f)
})
+ // Returns the /proc/self/mountinfo line for a given mount point
+ getMountInfo := func(volume string) []string {
+ containerDir := strings.SplitN(volume, ":", 3)[1]
+ session := podmanTest.Podman([]string{"run", "--rm", "-v", volume, ALPINE, "awk", fmt.Sprintf(`$5 == "%s" { print }`, containerDir), "/proc/self/mountinfo"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ Expect(session.OutputToString()).To(ContainSubstring(containerDir), "mount point not found in /proc/self/mountinfo")
+ return strings.Fields(session.OutputToString())
+ }
+
It("podman run with volume flag", func() {
mountPath := filepath.Join(podmanTest.TempDir, "secrets")
os.Mkdir(mountPath, 0755)
vol := mountPath + ":" + dest
- session := podmanTest.Podman([]string{"run", "--rm", "-v", vol, ALPINE, "grep", dest, "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches := session.GrepString(dest)
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("rw"))
+ // [5] is flags
+ Expect(getMountInfo(vol)[5]).To(ContainSubstring("rw"))
+ Expect(getMountInfo(vol + ":ro")[5]).To(ContainSubstring("ro"))
- session = podmanTest.Podman([]string{"run", "--rm", "-v", vol + ":ro", ALPINE, "grep", dest, "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches = session.GrepString(dest)
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("ro"))
-
- session = podmanTest.Podman([]string{"run", "--rm", "-v", vol + ":shared", ALPINE, "grep", dest, "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches = session.GrepString(dest)
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("rw"))
- Expect(matches[0]).To(ContainSubstring("shared"))
+ mountinfo := getMountInfo(vol + ":shared")
+ Expect(mountinfo[5]).To(ContainSubstring("rw"))
+ Expect(mountinfo[6]).To(ContainSubstring("shared"))
// Cached is ignored
- session = podmanTest.Podman([]string{"run", "--rm", "-v", vol + ":cached", ALPINE, "grep", dest, "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches = session.GrepString(dest)
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("rw"))
- Expect(matches[0]).To(Not(ContainSubstring("cached")))
+ mountinfo = getMountInfo(vol + ":cached")
+ Expect(mountinfo[5]).To(ContainSubstring("rw"))
+ Expect(mountinfo).To(Not(ContainElement(ContainSubstring("cached"))))
// Delegated is ignored
- session = podmanTest.Podman([]string{"run", "--rm", "-v", vol + ":delegated", ALPINE, "grep", dest, "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches = session.GrepString(dest)
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("rw"))
- Expect(matches[0]).To(Not(ContainSubstring("delegated")))
+ mountinfo = getMountInfo(vol + ":delegated")
+ Expect(mountinfo[5]).To(ContainSubstring("rw"))
+ Expect(mountinfo).To(Not(ContainElement(ContainSubstring("delegated"))))
})
It("podman run with --mount flag", func() {
@@ -554,7 +542,7 @@ VOLUME /test/`, ALPINE)
Skip("Overlay mounts not supported when running in a container")
}
if rootless.IsRootless() {
- if _, err := exec.LookPath("fuse_overlay"); err != nil {
+ if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
@@ -565,20 +553,16 @@ VOLUME /test/`, ALPINE)
f.Close()
// Make sure host directory gets mounted in to container as overlay
- session := podmanTest.Podman([]string{"run", "--rm", "-v", fmt.Sprintf("%s:/run/test:O", mountPath), ALPINE, "grep", "/run/test", "/proc/self/mountinfo"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- found, matches := session.GrepString("/run/test")
- Expect(found).Should(BeTrue())
- Expect(matches[0]).To(ContainSubstring("overlay"))
+ volumeFlag := fmt.Sprintf("%s:/run/test:O", mountPath)
+ Expect(getMountInfo(volumeFlag)[7]).To(Equal("overlay"))
// Make sure host files show up in the container
- session = podmanTest.Podman([]string{"run", "--rm", "-v", fmt.Sprintf("%s:/run/test:O", mountPath), ALPINE, "ls", "/run/test/test1"})
+ session := podmanTest.Podman([]string{"run", "--rm", "-v", volumeFlag, ALPINE, "ls", "/run/test/test1"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
// Make sure modifications in container do not show up on host
- session = podmanTest.Podman([]string{"run", "--rm", "-v", fmt.Sprintf("%s:/run/test:O", mountPath), ALPINE, "touch", "/run/test/container"})
+ session = podmanTest.Podman([]string{"run", "--rm", "-v", volumeFlag, ALPINE, "touch", "/run/test/container"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
_, err = os.Stat(filepath.Join(mountPath, "container"))