diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-02 13:47:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 13:47:12 -0400 |
| commit | fa487a65220951e84779f200f48780666b4b9209 (patch) | |
| tree | cb71124cb22c024cce904c91ba056a7047f04d78 /test | |
| parent | 37791d717f85c0621932aa18cd4c2477426a2de0 (diff) | |
| parent | d68a6b52ecd5354dccfb2f62dd7b06518200fa28 (diff) | |
| download | podman-fa487a65220951e84779f200f48780666b4b9209.tar.gz podman-fa487a65220951e84779f200f48780666b4b9209.tar.bz2 podman-fa487a65220951e84779f200f48780666b4b9209.zip | |
Merge pull request #7532 from rhatdan/run
We should not be mounting /run as noexec when run with --systemd
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 8 | ||||
| -rw-r--r-- | test/e2e/systemd_test.go | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 91b0d3e48..1ac753201 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -919,6 +919,14 @@ USER mail` Expect(session.OutputToString()).To(Not(ContainSubstring("/dev/shm type tmpfs (ro,"))) }) + It("podman run readonly container should NOT mount /run noexec", func() { + session := podmanTest.Podman([]string{"run", "--read-only", ALPINE, "sh", "-c", "mount | grep \"/run \""}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + + Expect(session.OutputToString()).To(Not(ContainSubstring("noexec"))) + }) + It("podman run with bad healthcheck retries", func() { session := podmanTest.Podman([]string{"run", "-dt", "--health-cmd", "[\"foo\"]", "--health-retries", "0", ALPINE, "top"}) session.Wait() diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index b5114e429..9a3247b77 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -146,4 +146,12 @@ WantedBy=multi-user.target Expect(len(conData)).To(Equal(1)) Expect(conData[0].Config.SystemdMode).To(BeTrue()) }) + + It("podman run --systemd container should NOT mount /run noexec", func() { + session := podmanTest.Podman([]string{"run", "--systemd", "always", ALPINE, "sh", "-c", "mount | grep \"/run \""}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + + Expect(session.OutputToString()).To(Not(ContainSubstring("noexec"))) + }) }) |