fix test

Author: JulyWindK

pkg/agent/qrm-plugins/memory/dynamicpolicy/policy_test.go

@@ -76,6 +76,7 @@ import (
 	metaserveragent "github.com/kubewharf/katalyst-core/pkg/metaserver/agent"
 	"github.com/kubewharf/katalyst-core/pkg/metaserver/agent/pod"
 	"github.com/kubewharf/katalyst-core/pkg/metaserver/external"
+	kcc "github.com/kubewharf/katalyst-core/pkg/metaserver/kcc"
 	"github.com/kubewharf/katalyst-core/pkg/metrics"
 	"github.com/kubewharf/katalyst-core/pkg/util/asyncworker"
 	"github.com/kubewharf/katalyst-core/pkg/util/machine"
@@ -3226,7 +3227,8 @@ func makeMetaServer() *metaserver.MetaServer {
 			},
 			PodFetcher: &pod.PodFetcherStub{},
 		},
-		ExternalManager: external.InitExternalManager(&pod.PodFetcherStub{}),
+		ConfigurationManager: &kcc.DummyConfigurationManager{},
+		ExternalManager:      external.InitExternalManager(&pod.PodFetcherStub{}),
 	}
 }
 

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

@@ -19,7 +19,9 @@ package userwatermark
 import (
 	"fmt"
 	"sync"
+	"sync/atomic"
 	"testing"
+	"time"
 
 	"github.com/bytedance/mockey"
 	"github.com/stretchr/testify/assert"
@@ -43,6 +45,12 @@ import (
 // Guard all mockey usage in this package even when tests use t.Parallel().
 var mockeyMutex sync.Mutex
 
+// Track currently running mockey tests to prevent concurrent mockey usage
+var (
+	mockeyTestCount int32
+	mockeyTestMutex sync.Mutex
+)
+
 func generateUserWatermarkTestMetaServer(pods []*v1.Pod) *metaserver.MetaServer {
 	podFetcher := &metapod.PodFetcherStub{PodList: pods}
 
@@ -89,6 +97,21 @@ func TestUserWatermarkReclaimManager_Reconcile_Disabled(t *testing.T) {
 
 func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(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()
 
@@ -153,6 +176,21 @@ func TestUserWatermarkReclaimManager_Reconcile_CreateReclaimers(t *testing.T) {
 
 func TestUserWatermarkReclaimManager_Reconcile_GetPodListError(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()
 

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

@@ -19,6 +19,7 @@ package userwatermark
 import (
 	"context"
 	"fmt"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -36,6 +37,8 @@ import (
 	"github.com/kubewharf/katalyst-core/pkg/util/machine"
 )
 
+// Import shared variables from manager_test.go
+
 func newTestDynamicConf() *dynamicconfig.DynamicAgentConfiguration {
 	// NewDynamicAgentConfiguration already initializes a non-nil
 	// UserWatermarkConfiguration via NewConfiguration().
@@ -205,6 +208,21 @@ func TestGetContainerCgroupPath_SuccessAndError(t *testing.T) {
 
 	t.Run("success", 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()
 
@@ -239,6 +257,21 @@ func TestGetCGroupMemoryLimitAndUsage(t *testing.T) {
 
 	t.Run("success", 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()
 
@@ -289,6 +322,21 @@ func TestGetCGroupMemoryStats(t *testing.T) {
 
 	t.Run("success", 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()
 
@@ -347,6 +395,21 @@ func TestReachedHighWatermark(t *testing.T) {
 
 func TestUserWatermarkReclaimer_ReclaimSuccess(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()
 
@@ -423,6 +486,21 @@ func TestUserWatermarkReclaimer_ReclaimSuccess(t *testing.T) {
 
 func TestUserWatermarkReclaimer_ReclaimGetStatsFailed(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()