libcontainer/intelrdt: make mock clos name an arg of test helper

Signed-off-by: Markus Lehtonen <[email protected]>

Author: marquiz

libcontainer/intelrdt/intelrdt_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestIntelRdtSetL3CacheSchema(t *testing.T) {
-	helper := NewIntelRdtTestUtil(t)
+	helper := NewIntelRdtTestUtil(t, "clos-1")
 
 	const (
 		l3CacheSchemaBefore = "L3:0=f;1=f0"
@@ -41,7 +41,7 @@ func TestIntelRdtSetL3CacheSchema(t *testing.T) {
 }
 
 func TestIntelRdtSetMemBwSchema(t *testing.T) {
-	helper := NewIntelRdtTestUtil(t)
+	helper := NewIntelRdtTestUtil(t, "clos-1")
 
 	const (
 		memBwSchemaBefore = "MB:0=20;1=70"
@@ -71,7 +71,7 @@ func TestIntelRdtSetMemBwSchema(t *testing.T) {
 }
 
 func TestIntelRdtSetMemBwScSchema(t *testing.T) {
-	helper := NewIntelRdtTestUtil(t)
+	helper := NewIntelRdtTestUtil(t, "clos-1")
 
 	const (
 		memBwScSchemaBefore = "MB:0=5000;1=7000"
@@ -157,19 +157,19 @@ func TestApply(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			NewIntelRdtTestUtil(t)
 			id := "abcd-1234"
-			closPath := filepath.Join(intelRdtRoot, id)
+			closName := id
 			if tt.config.ClosID != "" {
-				closPath = filepath.Join(intelRdtRoot, tt.config.ClosID)
+				closName = tt.config.ClosID
 			}
 
+			preConfiguredClos := ""
 			if tt.precreateClos {
-				if err := os.MkdirAll(filepath.Join(closPath, "mon_groups"), 0o755); err != nil {
-					t.Fatal(err)
-				}
+				preConfiguredClos = closName
 			}
-			m := newManager(&configs.Config{IntelRdt: &tt.config}, id, closPath)
+			NewIntelRdtTestUtil(t, preConfiguredClos)
+
+			m := newManager(&configs.Config{IntelRdt: &tt.config}, id, filepath.Join(intelRdtRoot, closName))
 			err := m.Apply(pid)
 			if tt.isError && err == nil {
 				t.Fatal("expected error, got nil")
@@ -255,18 +255,16 @@ func TestDestroy(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			NewIntelRdtTestUtil(t)
-
 			id := "abcd-1234"
-			closPath := filepath.Join(intelRdtRoot, id)
+			closName := id
+			preConfiguredClos := ""
 			if tt.config.ClosID != "" {
-				closPath = filepath.Join(intelRdtRoot, tt.config.ClosID)
-				// Pre-create the CLOS directory
-				if err := os.MkdirAll(filepath.Join(closPath, "mon_groups"), 0o755); err != nil {
-					t.Fatal(err)
-				}
+				closName = tt.config.ClosID
+				preConfiguredClos = closName
 			}
-			m := newManager(&configs.Config{IntelRdt: &tt.config}, id, closPath)
+			NewIntelRdtTestUtil(t, preConfiguredClos)
+
+			m := newManager(&configs.Config{IntelRdt: &tt.config}, id, filepath.Join(intelRdtRoot, closName))
 			if err := m.Apply(1234); err != nil {
 				t.Fatalf("Apply() failed: %v", err)
 			}

libcontainer/intelrdt/util_test.go

@@ -15,14 +15,14 @@ import (
 type intelRdtTestUtil struct {
 	config *configs.Config
 
-	// Path to the mock Intel RDT "resource control" filesystem directory
+	// Path to the mock pre-existing CLOS (or resctrl root if no CLOS is specified)
 	IntelRdtPath string
 
 	t *testing.T
 }
 
-// Creates a new test util
-func NewIntelRdtTestUtil(t *testing.T) *intelRdtTestUtil {
+// Creates a new test util. If mockClosName is non-empty, a mock CLOS with that name will be created.
+func NewIntelRdtTestUtil(t *testing.T, mockClosName string) *intelRdtTestUtil {
 	config := &configs.Config{
 		IntelRdt: &configs.IntelRdt{},
 	}
@@ -32,12 +32,13 @@ func NewIntelRdtTestUtil(t *testing.T) *intelRdtTestUtil {
 	// Make sure Root() won't even try to parse mountinfo.
 	rootOnce.Do(func() {})
 
-	testIntelRdtPath := filepath.Join(intelRdtRoot, "resctrl")
+	testIntelRdtPath := filepath.Join(intelRdtRoot, mockClosName)
 
-	// Ensure the full mock Intel RDT "resource control" filesystem path exists
-	if err := os.MkdirAll(testIntelRdtPath, 0o755); err != nil {
+	// Ensure the mocked CLOS exists
+	if err := os.MkdirAll(filepath.Join(testIntelRdtPath, "mon_groups"), 0o755); err != nil {
 		t.Fatal(err)
 	}
+
 	return &intelRdtTestUtil{config: config, IntelRdtPath: testIntelRdtPath, t: t}
 }