Merge pull request #4295 from kolyshkin/fix-setv1-panic

libct/cg/dev: fix TestSetV1Allow panic
opencontainers · Jun 1, 2024 · ba4b52d · ba4b52d
2 parents 94d255b + d697725
commit ba4b52d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libcontainer/cgroups/devices/v1_test.go b/libcontainer/cgroups/devices/v1_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/devices"
+	"github.com/opencontainers/runc/libcontainer/userns"
 )
 
 func init() {
@@ -17,6 +18,9 @@ func init() {
 }
 
 func TestSetV1Allow(t *testing.T) {
+	if userns.RunningInUserNS() {
+		t.Skip("userns detected; setV1 does nothing")
+	}
 	dir := t.TempDir()
 
 	for file, contents := range map[string]string{