diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-28 14:43:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 14:43:46 +0000 |
| commit | b0e70a6411d70d7ee7f1e9d6abedc2524b903609 (patch) | |
| tree | 6987290e36b8782fe12ff4506bdc017d4b32de60 /test/e2e/containers_conf_test.go | |
| parent | d2802636b0a7e3d281e52b44676de5e3226fbabf (diff) | |
| parent | 007c0ecd50846900eaa7b8ea2fde08c83746abda (diff) | |
| download | podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.tar.gz podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.tar.bz2 podman-b0e70a6411d70d7ee7f1e9d6abedc2524b903609.zip | |
Merge pull request #7786 from rhatdan/rootless
Remove SkipIfRootless if possible, document other calls
Diffstat (limited to 'test/e2e/containers_conf_test.go')
| -rw-r--r-- | test/e2e/containers_conf_test.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 8339b7732..02c5d1428 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -41,7 +41,7 @@ var _ = Describe("Podman run", func() { }) It("podman run limits test", func() { - SkipIfRootless() + SkipIfRootlessCgroupsV1() //containers.conf is set to "nofile=500:500" session := podmanTest.Podman([]string{"run", "--rm", fedoraMinimal, "ulimit", "-n"}) session.WaitWithDefaultTimeout() @@ -80,7 +80,6 @@ var _ = Describe("Podman run", func() { }) It("podman Capabilities in containers.conf", func() { - SkipIfRootless() os.Setenv("CONTAINERS_CONF", "config/containers.conf") cap := podmanTest.Podman([]string{"run", ALPINE, "grep", "CapEff", "/proc/self/status"}) cap.WaitWithDefaultTimeout() @@ -94,7 +93,6 @@ var _ = Describe("Podman run", func() { }) It("podman Regular capabilities", func() { - SkipIfRootless() os.Setenv("CONTAINERS_CONF", "config/containers.conf") setup := podmanTest.RunTopContainer("test1") setup.WaitWithDefaultTimeout() @@ -176,7 +174,6 @@ var _ = Describe("Podman run", func() { }) It("podman run containers.conf sysctl test", func() { - SkipIfRootless() //containers.conf is set to "net.ipv4.ping_group_range=0 1000" session := podmanTest.Podman([]string{"run", "--rm", fedoraMinimal, "cat", "/proc/sys/net/ipv4/ping_group_range"}) session.WaitWithDefaultTimeout() |