From 84ff621309d728ed33dc03ba7310dfca11c34f35 Mon Sep 17 00:00:00 2001 From: binacs Date: Sun, 19 Feb 2023 21:49:58 +0800 Subject: [PATCH] cleanup(controller): use IsSuperset to avoid interim slice --- .../nodelifecycle/scheduler/rate_limited_queue_test.go | 2 +- .../resourcequota/resource_quota_controller_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/nodelifecycle/scheduler/rate_limited_queue_test.go b/pkg/controller/nodelifecycle/scheduler/rate_limited_queue_test.go index 644b6569039..f54b488e6c6 100644 --- a/pkg/controller/nodelifecycle/scheduler/rate_limited_queue_test.go +++ b/pkg/controller/nodelifecycle/scheduler/rate_limited_queue_test.go @@ -35,7 +35,7 @@ func CheckQueueEq(lhs []string, rhs TimedQueue) bool { } func CheckSetEq(lhs, rhs sets.String) bool { - return lhs.HasAll(rhs.List()...) && rhs.HasAll(lhs.List()...) + return lhs.IsSuperset(rhs) && rhs.IsSuperset(lhs) } func TestAddNode(t *testing.T) { diff --git a/pkg/controller/resourcequota/resource_quota_controller_test.go b/pkg/controller/resourcequota/resource_quota_controller_test.go index 83b6d8cb3db..8a99dcacdc4 100644 --- a/pkg/controller/resourcequota/resource_quota_controller_test.go +++ b/pkg/controller/resourcequota/resource_quota_controller_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -797,7 +797,7 @@ func TestSyncResourceQuota(t *testing.T) { for _, action := range kubeClient.Actions() { actionSet.Insert(strings.Join([]string{action.GetVerb(), action.GetResource().Resource, action.GetSubresource()}, "-")) } - if !actionSet.HasAll(testCase.expectedActionSet.List()...) { + if !actionSet.IsSuperset(testCase.expectedActionSet) { t.Errorf("test: %s,\nExpected actions:\n%v\n but got:\n%v\nDifference:\n%v", testName, testCase.expectedActionSet, actionSet, testCase.expectedActionSet.Difference(actionSet)) }