Skip to content

Commit e01059c

Browse files
committed
Fix existing tests
1 parent c2559bf commit e01059c

6 files changed

+65
-9
lines changed

internal/alb/tg/mock_Controller.go

+10-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/alb/tg/mock_TargetsController.go

+9-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/alb/tg/targetgroup_group_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,9 @@ func TestDefaultGroupController_GC(t *testing.T) {
710710
}
711711
mockNameTagGen := &MockNameTagGenerator{}
712712
mockTGController := &MockController{}
713+
for _, call := range tc.DeleteTargetGroupByArnCalls {
714+
mockTGController.On("StopReconcilingPodConditionStatus", call.Arn).Return()
715+
}
713716

714717
controller := &defaultGroupController{
715718
cloud: cloud,
@@ -818,6 +821,9 @@ func TestDefaultGroupController_Delete(t *testing.T) {
818821
mockNameTagGen.On("TagTGGroup", tc.TagTGGroupCall.Namespace, tc.TagTGGroupCall.IngressName).Return(tc.TagTGGroupCall.Tags)
819822
}
820823
mockTGController := &MockController{}
824+
for _, call := range tc.DeleteTargetGroupByArnCalls {
825+
mockTGController.On("StopReconcilingPodConditionStatus", call.Arn).Return()
826+
}
821827

822828
controller := &defaultGroupController{
823829
cloud: cloud,

internal/alb/tg/targethealth_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package tg

internal/alb/tg/targets_test.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import (
1212
"github.com/kubernetes-sigs/aws-alb-ingress-controller/internal/ingress/controller/dummy"
1313
"github.com/kubernetes-sigs/aws-alb-ingress-controller/mocks"
1414
"github.com/stretchr/testify/assert"
15+
"github.com/stretchr/testify/mock"
1516
corev1 "k8s.io/api/core/v1"
1617
extensions "k8s.io/api/extensions/v1beta1"
1718
"k8s.io/apimachinery/pkg/util/intstr"
19+
testclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
1820
)
1921

2022
func Test_NewTargets(t *testing.T) {
@@ -265,6 +267,9 @@ func Test_TargetsReconcile(t *testing.T) {
265267
endpointResolver := &mocks.EndpointResolver{}
266268
if tc.ResolveCall != nil {
267269
endpointResolver.On("Resolve", tc.ResolveCall.InputIngress, tc.ResolveCall.InputBackend, tc.ResolveCall.InputTargetType).Return(tc.ResolveCall.Output, tc.ResolveCall.Err)
270+
if tc.ResolveCall.InputTargetType == elbv2.TargetTypeEnumIp {
271+
endpointResolver.On("ReverseResolve", tc.ResolveCall.InputIngress, tc.ResolveCall.InputBackend, mock.Anything).Return(make([]*corev1.Pod, len(tc.ResolveCall.Output)), nil)
272+
}
268273
}
269274

270275
cloud := &mocks.CloudAPI{}
@@ -281,7 +286,9 @@ func Test_TargetsReconcile(t *testing.T) {
281286
cloud.On("GetVpcWithContext", ctx).Return(tc.GetVpcCall.Output, tc.GetVpcCall.Err)
282287
}
283288

284-
controller := NewTargetsController(cloud, endpointResolver)
289+
client := testclient.NewFakeClient()
290+
291+
controller := NewTargetsController(cloud, endpointResolver, client)
285292
err := controller.Reconcile(context.Background(), tc.Targets)
286293

287294
if tc.ExpectedError != nil {

mocks/EndpointResolver.go

+31-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)