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

AkihiroSuda · web-flow · commit ba4b52d37271 · 2024-06-02T02:13:36.000+09:00
libct/cg/dev: fix TestSetV1Allow panic
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{

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"`
`10`	`10`	`"github.com/opencontainers/runc/libcontainer/configs"`
`11`	`11`	`"github.com/opencontainers/runc/libcontainer/devices"`
	`12`	`+ "github.com/opencontainers/runc/libcontainer/userns"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`func init() {`
`@@ -17,6 +18,9 @@ func init() {`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`func TestSetV1Allow(t *testing.T) {`
	`21`	`+ if userns.RunningInUserNS() {`
	`22`	`+ t.Skip("userns detected; setV1 does nothing")`
	`23`	`+ }`
`20`	`24`	`dir := t.TempDir()`
`21`	`25`
`22`	`26`	`for file, contents := range map[string]string{`