From 2de0b5aaf3fc7d6add89ed2c38788a2e3e23e790 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Sat, 8 Aug 2020 19:19:31 -0700 Subject: [PATCH] libct/integration: enable some tests for cgroupv2 The only two tests that are still skipped on v2 are kmem and invalid CpuShares test -- since v2 does not support either. Signed-off-by: Kir Kolyshkin --- libcontainer/integration/exec_test.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go index ada513b55..923c5797c 100644 --- a/libcontainer/integration/exec_test.go +++ b/libcontainer/integration/exec_test.go @@ -207,9 +207,6 @@ func TestEnter(t *testing.T) { if testing.Short() { return } - if cgroups.IsCgroup2UnifiedMode() { - t.Skip("cgroup v2 is not supported") - } rootfs, err := newRootfs() ok(t, err) @@ -516,9 +513,6 @@ func testFreeze(t *testing.T, systemd bool) { if testing.Short() { return } - if cgroups.IsCgroup2UnifiedMode() { - t.Skip("cgroup v2 is not supported") - } rootfs, err := newRootfs() ok(t, err) @@ -574,7 +568,7 @@ func testCpuShares(t *testing.T, systemd bool) { return } if cgroups.IsCgroup2UnifiedMode() { - t.Skip("cgroup v2 is not supported") + t.Skip("cgroup v2 does not support CpuShares") } rootfs, err := newRootfs() @@ -608,9 +602,6 @@ func testPids(t *testing.T, systemd bool) { if testing.Short() { return } - if cgroups.IsCgroup2UnifiedMode() { - t.Skip("cgroup v2 is not supported") - } rootfs, err := newRootfs() ok(t, err) @@ -695,7 +686,7 @@ func testRunWithKernelMemory(t *testing.T, systemd bool) { return } if cgroups.IsCgroup2UnifiedMode() { - t.Skip("cgroup v2 is not supported") + t.Skip("cgroup v2 does not support kernel memory limit") } rootfs, err := newRootfs()