Merge pull request #4031 from QazerLab/master

Skip spec_test for rootless envs without cgroup v2.

1 files changed, 24 insertions, 14 deletions

diff --git a/pkg/spec/spec_test.go b/pkg/spec/spec_test.go
index 0abff491b..2f91e1b21 100644
--- a/pkg/spec/spec_test.go
+++ b/pkg/spec/spec_test.go
@@ -4,6 +4,8 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/containers/libpod/pkg/cgroups"
+	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/libpod/pkg/sysinfo"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/idtools"
@@ -26,14 +28,30 @@ func makeTestCreateConfig() *CreateConfig {
 	return cc
 }
 
-// TestPIDsLimit verifies the given pid-limit is correctly defined in the spec
-func TestPIDsLimit(t *testing.T) {
+func doCommonSkipChecks(t *testing.T) {
 	// The default configuration of podman enables seccomp, which is not available on non-Linux systems.
 	// Thus, any tests that use the default seccomp setting would fail.
 	// Skip the tests on non-Linux platforms rather than explicitly disable seccomp in the test and possibly affect the test result.
 	if runtime.GOOS != "linux" {
 		t.Skip("seccomp, which is enabled by default, is only supported on Linux")
 	}
+
+	if rootless.IsRootless() {
+		isCgroupV2, err := cgroups.IsCgroup2UnifiedMode()
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+
+		if !isCgroupV2 {
+			t.Skip("cgroups v1 cannot be used when rootless")
+		}
+	}
+}
+
+// TestPIDsLimit verifies the given pid-limit is correctly defined in the spec
+func TestPIDsLimit(t *testing.T) {
+	doCommonSkipChecks(t)
+
 	if !sysInfo.PidsLimit {
 		t.Skip("running test not supported by the host system")
 	}
@@ -50,12 +68,8 @@ func TestPIDsLimit(t *testing.T) {
 // TestBLKIOWeightDevice verifies the given blkio weight is correctly set in the
 // spec.
 func TestBLKIOWeightDevice(t *testing.T) {
-	// The default configuration of podman enables seccomp, which is not available on non-Linux systems.
-	// Thus, any tests that use the default seccomp setting would fail.
-	// Skip the tests on non-Linux platforms rather than explicitly disable seccomp in the test and possibly affect the test result.
-	if runtime.GOOS != "linux" {
-		t.Skip("seccomp, which is enabled by default, is only supported on Linux")
-	}
+	doCommonSkipChecks(t)
+
 	if !sysInfo.BlkioWeightDevice {
 		t.Skip("running test not supported by the host system")
 	}
@@ -75,12 +89,8 @@ func TestBLKIOWeightDevice(t *testing.T) {
 // TestMemorySwap verifies that the given swap memory limit is correctly set in
 // the spec.
 func TestMemorySwap(t *testing.T) {
-	// The default configuration of podman enables seccomp, which is not available on non-Linux systems.
-	// Thus, any tests that use the default seccomp setting would fail.
-	// Skip the tests on non-Linux platforms rather than explicitly disable seccomp in the test and possibly affect the test result.
-	if runtime.GOOS != "linux" {
-		t.Skip("seccomp, which is enabled by default, is only supported on Linux")
-	}
+	doCommonSkipChecks(t)
+
 	if !sysInfo.SwapLimit {
 		t.Skip("running test not supported by the host system")
 	}