From fef58c35724262f13d7553173dbef81b294a8a4c Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 11 Jul 2024 15:45:20 +0800 Subject: [PATCH] test: fix unit test of error keys --- pkg/yurthub/cachemanager/error_keys.go | 7 ++++--- pkg/yurthub/cachemanager/error_keys_test.go | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/yurthub/cachemanager/error_keys.go b/pkg/yurthub/cachemanager/error_keys.go index b44b8c7c1a2..cc782bdec4a 100644 --- a/pkg/yurthub/cachemanager/error_keys.go +++ b/pkg/yurthub/cachemanager/error_keys.go @@ -26,17 +26,18 @@ import ( "sync" "time" - "github.com/openyurtio/openyurt/pkg/projectinfo" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" + + "github.com/openyurtio/openyurt/pkg/projectinfo" ) var ( AOFPrefix = "/var/lib/" + projectinfo.GetHubName() ) -var ( +const ( CompressThresh = 20 ) @@ -53,7 +54,7 @@ func NewErrorKeys() *errorKeys { keys: make(map[string]string), queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultItemBasedRateLimiter(), "error-keys"), } - err := os.MkdirAll(AOFPrefix, 0644) + err := os.MkdirAll(AOFPrefix, 0755) if err != nil { klog.Errorf("failed to create dir: %v", err) return ek diff --git a/pkg/yurthub/cachemanager/error_keys_test.go b/pkg/yurthub/cachemanager/error_keys_test.go index 972915576d3..32dc7f27b0e 100644 --- a/pkg/yurthub/cachemanager/error_keys_test.go +++ b/pkg/yurthub/cachemanager/error_keys_test.go @@ -91,6 +91,7 @@ func TestRecover(t *testing.T) { if err != nil { t.Errorf("failed to marshal: %v", err) } + AOFPrefix = "/tmp/errorkeys" err = os.MkdirAll(AOFPrefix, 0755) if err != nil { t.Errorf("failed to create dir: %v", err) @@ -112,7 +113,11 @@ func TestRecover(t *testing.T) { } func TestCompress(t *testing.T) { - os.MkdirAll(AOFPrefix, 0644) + AOFPrefix = "/tmp/errorkeys" + err := os.MkdirAll(AOFPrefix, 0755) + if err != nil { + t.Errorf("failed to create dir: %v", err) + } keys := NewErrorKeys() for i := 0; i < 50; i++ { keys.put(fmt.Sprintf("key-%d", i), fmt.Sprintf("value-%d", i)) @@ -123,7 +128,7 @@ func TestCompress(t *testing.T) { for i := 0; i < 25; i++ { keys.put(fmt.Sprintf("key-%d", i), fmt.Sprintf("value-%d", i)) } - err := wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute, false, + err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute, false, func(ctx context.Context) (bool, error) { if keys.count == 50 { return true, nil