From 8daf9ec2d422f3c9a27a23c8de325c34297846cd Mon Sep 17 00:00:00 2001 From: wccsama Date: Thu, 2 Apr 2020 15:04:58 +0800 Subject: [PATCH] clean up the pattern --- pkg/controller/service/controller_test.go | 25 ++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkg/controller/service/controller_test.go b/pkg/controller/service/controller_test.go index c08ea363ec7..61433a8ca82 100644 --- a/pkg/controller/service/controller_test.go +++ b/pkg/controller/service/controller_test.go @@ -41,6 +41,7 @@ import ( fakecloud "k8s.io/cloud-provider/fake" servicehelper "k8s.io/cloud-provider/service/helpers" featuregatetesting "k8s.io/component-base/featuregate/testing" + "k8s.io/kubernetes/pkg/controller" ) @@ -346,23 +347,19 @@ func TestSyncLoadBalancerIfNeeded(t *testing.T) { t.Errorf("Got no create call for load balancer, expected one") } - var isFound bool - for _, balancer := range cloud.Balancers { - if !reflect.DeepEqual(balancer, fakecloud.Balancer{}) { - isFound = true - if balancer.Name != controller.balancer.GetLoadBalancerName(context.Background(), "", tc.service) || - balancer.Region != region || - balancer.Ports[0].Port != tc.service.Spec.Ports[0].Port { - t.Errorf("Created load balancer has incorrect parameters: %v", balancer) - } - break - } - } - - if !isFound { + if len(cloud.Balancers) == 0 { t.Errorf("Got no load balancer: %v, expected one to be created", cloud.Balancers) } + + for _, balancer := range cloud.Balancers { + if balancer.Name != controller.balancer.GetLoadBalancerName(context.Background(), "", tc.service) || + balancer.Region != region || + balancer.Ports[0].Port != tc.service.Spec.Ports[0].Port { + t.Errorf("Created load balancer has incorrect parameters: %v", balancer) + } + } } + if tc.expectDeleteAttempt { deleteCallFound := false for _, call := range cloud.Calls {