libcontainer/integration/checkpoint_test: simplify

Since commit 9280e3566d it is not longer needed to have `cgroup2'
mount.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-04-23 15:18:01 -07:00
parent 32d52a0fab
commit 20959b1666
1 changed files with 1 additions and 10 deletions

View File

@ -11,7 +11,6 @@ import (
"testing"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/configs"
"golang.org/x/sys/unix"
@ -80,17 +79,9 @@ func testCheckpoint(t *testing.T, userns bool) {
config.GidMappings = []configs.IDMap{{HostID: 0, ContainerID: 0, Size: 1000}}
config.Namespaces = append(config.Namespaces, configs.Namespace{Type: configs.NEWUSER})
} else {
var cgroupDevice string
if cgroups.IsCgroup2UnifiedMode() {
cgroupDevice = "cgroup2"
} else {
cgroupDevice = "cgroup"
}
config.Mounts = append(config.Mounts, &configs.Mount{
Destination: "/sys/fs/cgroup",
Device: cgroupDevice,
Device: "cgroup",
Flags: defaultMountFlags | unix.MS_RDONLY,
})
}