aboutsummaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-22 16:51:04 +0200
committerGitHub <noreply@github.com>2020-05-22 16:51:04 +0200
commitd48a47acbe03fd2544fc61bdaba9eb0b8d1db388 (patch)
treed8673fce0c5d8c2df837a215edd27dcc6d3375f1 /test/e2e
parentc210bb16ffd835e8ed647917baaefdfa8b785b11 (diff)
parent67812a52ca893f1a007b2951ce8692579f9238f3 (diff)
downloadpodman-d48a47acbe03fd2544fc61bdaba9eb0b8d1db388.tar.gz
podman-d48a47acbe03fd2544fc61bdaba9eb0b8d1db388.tar.bz2
podman-d48a47acbe03fd2544fc61bdaba9eb0b8d1db388.zip
Merge pull request #6325 from mheon/noexec_backport
Turn off 'noexec' option by default for named volumes
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/create_test.go2
-rw-r--r--test/e2e/run_volume_test.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index 10742a0e8..efccc21f7 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -205,7 +205,7 @@ var _ = Describe("Podman create", func() {
session = podmanTest.Podman([]string{"logs", "test_tmpfs"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.OutputToString()).To(ContainSubstring("/create/test rw,nosuid,nodev,noexec,relatime - tmpfs"))
+ Expect(session.OutputToString()).To(ContainSubstring("/create/test rw,nosuid,nodev,relatime - tmpfs"))
})
It("podman create --pod automatically", func() {
diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 1f892d9f8..58091ff68 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -117,7 +117,7 @@ var _ = Describe("Podman run with volumes", func() {
session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=" + dest, ALPINE, "grep", dest, "/proc/self/mountinfo"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.OutputToString()).To(ContainSubstring(dest + " rw,nosuid,nodev,noexec,relatime - tmpfs"))
+ Expect(session.OutputToString()).To(ContainSubstring(dest + " rw,nosuid,nodev,relatime - tmpfs"))
session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=tmpfs,target=/etc/ssl,tmpcopyup", ALPINE, "ls", "/etc/ssl"})
session.WaitWithDefaultTimeout()