summaryrefslogtreecommitdiff
path: root/test/e2e/containers_conf_test.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-09-25 14:14:27 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-09-27 07:55:16 -0400
commit007c0ecd50846900eaa7b8ea2fde08c83746abda (patch)
tree83dabc69d240b41a0fbecd6a3f80e723cd206240 /test/e2e/containers_conf_test.go
parent03d01abec6d028e9d5f60615b0451e42d0611d1d (diff)
downloadpodman-007c0ecd50846900eaa7b8ea2fde08c83746abda.tar.gz
podman-007c0ecd50846900eaa7b8ea2fde08c83746abda.tar.bz2
podman-007c0ecd50846900eaa7b8ea2fde08c83746abda.zip
Remove SkipIfRootless if possible, document other calls
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e/containers_conf_test.go')
-rw-r--r--test/e2e/containers_conf_test.go5
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()