summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-15 03:52:39 -0700
committerGitHub <noreply@github.com>2018-10-15 03:52:39 -0700
commit3639ac1ad009ad9579e27cb15ff9095c5c92eb76 (patch)
tree3dc54ec0ab640c5cd2aa8a6c1a20e0f34cf2fbc4 /test
parent2c4f3d6dad524ce9886b044ea7a22df05043264c (diff)
parent83f79dbacc3eb6eb655960281cf28cf90842759b (diff)
downloadpodman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.tar.gz
podman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.tar.bz2
podman-3639ac1ad009ad9579e27cb15ff9095c5c92eb76.zip
Merge pull request #1631 from giuseppe/papr-drop-double-process
papr_prepare: remove double process for starting up .papr.sh
Diffstat (limited to 'test')
-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)