fix test

Author: JulyWindK

pkg/agent/qrm-plugins/memory/dynamicpolicy/userwatermark/manager_test.go

@@ -124,13 +124,13 @@ func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 	conf.UserWatermarkConfiguration.ServiceLabel = "svc-label"
 
 	// add a cgroup level configuration
-	cgPath := "/sys/fs/cgroup/memory/custom"
+	cgPath := "/sys/fs/cgroup/memory/custom-test-create"
 	conf.UserWatermarkConfiguration.CgroupConfig[cgPath] = userwmconfig.NewReclaimConfigDetail(conf.UserWatermarkConfiguration.DefaultConfig)
 
 	podObj := &v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
-			UID:       "pod-uid-1",
-			Name:      "test-pod",
+			UID:       "pod-uid-1-test-create",
+			Name:      "test-pod-create",
 			Namespace: "default",
 			Annotations: map[string]string{
 				katalystapiconsts.PodAnnotationQoSLevelKey: katalystapiconsts.PodAnnotationQoSLevelSharedCores,
@@ -144,7 +144,7 @@ func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 			ContainerStatuses: []v1.ContainerStatus{
 				{
 					Name:        "c1",
-					ContainerID: "containerd://cid-1",
+					ContainerID: "containerd://cid-1-test-create",
 					Ready:       true,
 				},
 			},
@@ -156,7 +156,7 @@ func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 	// patch container cgroup path helper to avoid touching real cgroups
 	mockey.Mock(common.GetContainerAbsCgroupPath).
 		To(func(_ string, podUID, containerID string) (string, error) {
-			return "/sys/fs/cgroup/memory/test-cgroup", nil
+			return "/sys/fs/cgroup/memory/test-cgroup-create", nil
 		}).Build()
 
 	m := NewUserWatermarkReclaimManager(qosConfig, dynamicConf, metrics.DummyMetrics{}, ms)
@@ -240,33 +240,34 @@ func TestUserWatermarkReclaimManager_Reconcile_CleanupStaleReclaimers(t *testing
 
 	m := NewUserWatermarkReclaimManager(qosConfig, dynamicConf, metrics.DummyMetrics{}, ms)
 
-	podContainerKey := katalystcoreconsts.PodContainerName("pod-1,container-1")
-	cgPath := "/sys/fs/cgroup/memory/old"
+	// Generate unique keys to avoid potential conflicts with other parallel tests
+	podContainerKey := katalystcoreconsts.PodContainerName("pod-1,container-1-test-cleanup")
+	cgPath := "/sys/fs/cgroup/memory/old-test-cleanup"
 
 	frContainer := &fakeReclaimer{}
 	frCgroup := &fakeReclaimer{}
 
+	// Directly set the state since we're testing the reconcile logic
 	m.containerReclaimer[podContainerKey] = frContainer
 	m.cgroupPathReclaimer[cgPath] = frCgroup
-
 	m.started[string(podContainerKey)] = true
 	m.started[cgPath] = true
 
 	// no CgroupConfig for cgPath, and no pods => both reclaimers should be cleaned
 	m.reconcile()
 
 	_, exist := m.containerReclaimer[podContainerKey]
-	assert.False(t, exist)
+	assert.False(t, exist, "container reclaimer should be cleaned up")
 
 	_, exist = m.cgroupPathReclaimer[cgPath]
-	assert.False(t, exist)
+	assert.False(t, exist, "cgroup path reclaimer should be cleaned up")
 
 	_, exist = m.started[string(podContainerKey)]
-	assert.False(t, exist)
+	assert.False(t, exist, "container started flag should be removed")
 
 	_, exist = m.started[cgPath]
-	assert.False(t, exist)
+	assert.False(t, exist, "cgroup path started flag should be removed")
 
-	assert.True(t, frContainer.stopped)
-	assert.True(t, frCgroup.stopped)
+	assert.True(t, frContainer.stopped, "container reclaimer should be stopped")
+	assert.True(t, frCgroup.stopped, "cgroup path reclaimer should be stopped")
 }

pkg/agent/qrm-plugins/memory/dynamicpolicy/userwatermark/reclaimer_test.go

@@ -238,6 +238,21 @@ func TestGetContainerCgroupPath_SuccessAndError(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
+
+		// Ensure only one mockey test runs at a time
+		mockeyTestMutex.Lock()
+		for atomic.LoadInt32(&mockeyTestCount) > 0 {
+			mockeyTestMutex.Unlock()
+			time.Sleep(10 * time.Millisecond)
+			mockeyTestMutex.Lock()
+		}
+		atomic.StoreInt32(&mockeyTestCount, 1)
+		mockeyTestMutex.Unlock()
+
+		defer func() {
+			atomic.StoreInt32(&mockeyTestCount, 0)
+		}()
+
 		mockeyMutex.Lock()
 		defer mockeyMutex.Unlock()
 
@@ -288,6 +303,21 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
+
+		// Ensure only one mockey test runs at a time
+		mockeyTestMutex.Lock()
+		for atomic.LoadInt32(&mockeyTestCount) > 0 {
+			mockeyTestMutex.Unlock()
+			time.Sleep(10 * time.Millisecond)
+			mockeyTestMutex.Lock()
+		}
+		atomic.StoreInt32(&mockeyTestCount, 1)
+		mockeyTestMutex.Unlock()
+
+		defer func() {
+			atomic.StoreInt32(&mockeyTestCount, 0)
+		}()
+
 		mockeyMutex.Lock()
 		defer mockeyMutex.Unlock()
 
@@ -303,6 +333,21 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("nilStats", func(t *testing.T) {
 		t.Parallel()
+
+		// Ensure only one mockey test runs at a time
+		mockeyTestMutex.Lock()
+		for atomic.LoadInt32(&mockeyTestCount) > 0 {
+			mockeyTestMutex.Unlock()
+			time.Sleep(10 * time.Millisecond)
+			mockeyTestMutex.Lock()
+		}
+		atomic.StoreInt32(&mockeyTestCount, 1)
+		mockeyTestMutex.Unlock()
+
+		defer func() {
+			atomic.StoreInt32(&mockeyTestCount, 0)
+		}()
+
 		mockeyMutex.Lock()
 		defer mockeyMutex.Unlock()
 
@@ -366,6 +411,21 @@ func TestGetCGroupMemoryStats(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		t.Parallel()
+
+		// Ensure only one mockey test runs at a time
+		mockeyTestMutex.Lock()
+		for atomic.LoadInt32(&mockeyTestCount) > 0 {
+			mockeyTestMutex.Unlock()
+			time.Sleep(10 * time.Millisecond)
+			mockeyTestMutex.Lock()
+		}
+		atomic.StoreInt32(&mockeyTestCount, 1)
+		mockeyTestMutex.Unlock()
+
+		defer func() {
+			atomic.StoreInt32(&mockeyTestCount, 0)
+		}()
+
 		mockeyMutex.Lock()
 		defer mockeyMutex.Unlock()