summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-10-12 16:59:01 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-10-14 16:52:30 +0200
commite1521c6323514426818f0df52d137c47a89bc25f (patch)
tree2bed7cf697d337dc3f240b952f7a60363f91c164
parentc173c2cfa017d327587b9faa46b4a4815ae6884a (diff)
downloadpodman-e1521c6323514426818f0df52d137c47a89bc25f.tar.gz
podman-e1521c6323514426818f0df52d137c47a89bc25f.tar.bz2
podman-e1521c6323514426818f0df52d137c47a89bc25f.zip
tests: do not make assumptions on the mount output
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--test/e2e/run_test.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 271651056..052dd0566 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -218,7 +218,11 @@ var _ = Describe("Podman run", func() {
session = podmanTest.Podman([]string{"run", "--rm", "--mount", fmt.Sprintf("type=bind,src=%s,target=/run/test,shared", mountPath), ALPINE, "grep", "/run/test", "/proc/self/mountinfo"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.OutputToString()).To(ContainSubstring("/run/test rw,relatime shared"))
+ found, matches := session.GrepString("/run/test")
+ Expect(found).Should(BeTrue())
+ Expect(matches[0]).To(ContainSubstring("rw"))
+ Expect(matches[0]).To(ContainSubstring("relatime"))
+ Expect(matches[0]).To(ContainSubstring("shared"))
mountPath = filepath.Join(podmanTest.TempDir, "scratchpad")
os.Mkdir(mountPath, 0755)