diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-29 14:59:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 14:59:16 +0000 |
| commit | bf10168614b35dbcfefff01ed63ee90b39cae8d7 (patch) | |
| tree | 7dd5af66ff89ad60a8481f9e97e7eb50fcbcf06d /test | |
| parent | 84dede4452d4f85ad6dacf2c66e00500685c24af (diff) | |
| parent | 0d70df119539d818224b0d014602aaad2bd1b95e (diff) | |
| download | podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.tar.gz podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.tar.bz2 podman-bf10168614b35dbcfefff01ed63ee90b39cae8d7.zip | |
Merge pull request #7811 from rhatdan/sysctls
Ignore containers.conf sysctl when namespaces set to host
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/containers_conf_test.go | 6 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 02c5d1428..ddb62c327 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -179,6 +179,12 @@ var _ = Describe("Podman run", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.OutputToString()).To(ContainSubstring("1000")) + + // Ignore containers.conf setting if --net=host + session = podmanTest.Podman([]string{"run", "--rm", "--net", "host", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.OutputToString()).ToNot((ContainSubstring("1000"))) }) It("podman run containers.conf search domain", func() { diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 5c28f18f2..5617f50b7 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -373,6 +373,11 @@ USER bin` session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.OutputToString()).To(ContainSubstring("net.core.somaxconn = 65535")) + + // network sysctls should fail if --net=host is set + session = podmanTest.Podman([]string{"run", "--net", "host", "--rm", "--sysctl", "net.core.somaxconn=65535", ALPINE, "sysctl", "net.core.somaxconn"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(125)) }) It("podman run blkio-weight test", func() { |