mirror of
https://github.com/containers/podman.git
synced 2025-11-29 17:48:05 +08:00
test/e2e: delete CgV1 skips, delete tests skipped on Cgv2
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
@@ -38,7 +38,6 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
. "github.com/onsi/gomega/gexec"
|
||||
"github.com/sirupsen/logrus"
|
||||
"go.podman.io/common/pkg/cgroups"
|
||||
"go.podman.io/common/pkg/libartifact"
|
||||
"go.podman.io/storage/pkg/ioutils"
|
||||
"go.podman.io/storage/pkg/lockfile"
|
||||
@@ -53,7 +52,6 @@ var (
|
||||
CGROUP_MANAGER = "systemd"
|
||||
RESTORE_IMAGES = []string{ALPINE, BB, NGINX_IMAGE}
|
||||
defaultWaitTimeout = 90
|
||||
CGROUPSV2, _ = cgroups.IsCgroup2UnifiedMode()
|
||||
)
|
||||
|
||||
// PodmanTestIntegration struct for command line options
|
||||
@@ -1080,13 +1078,6 @@ func SkipIfRunc(p *PodmanTestIntegration, reason string) {
|
||||
}
|
||||
}
|
||||
|
||||
func SkipIfRootlessCgroupsV1(reason string) {
|
||||
checkReason(reason)
|
||||
if isRootless() && !CGROUPSV2 {
|
||||
Skip("[rootless]: " + reason)
|
||||
}
|
||||
}
|
||||
|
||||
func SkipIfRootless(reason string) {
|
||||
checkReason(reason)
|
||||
if isRootless() {
|
||||
@@ -1179,24 +1170,6 @@ func isRootless() bool {
|
||||
return os.Geteuid() != 0
|
||||
}
|
||||
|
||||
func isCgroupsV1() bool {
|
||||
return !CGROUPSV2
|
||||
}
|
||||
|
||||
func SkipIfCgroupV1(reason string) {
|
||||
checkReason(reason)
|
||||
if isCgroupsV1() {
|
||||
Skip(reason)
|
||||
}
|
||||
}
|
||||
|
||||
func SkipIfCgroupV2(reason string) {
|
||||
checkReason(reason)
|
||||
if CGROUPSV2 {
|
||||
Skip(reason)
|
||||
}
|
||||
}
|
||||
|
||||
func isContainerized() bool {
|
||||
// This is set to "podman" by podman automatically
|
||||
return os.Getenv("container") != ""
|
||||
|
||||
Reference in New Issue
Block a user