Skip to content

Commit 6415be0

Browse files
committed
Fix unit tests
1 parent 7212628 commit 6415be0

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

cluster-autoscaler/cloudprovider/azure/azure_manager_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@ func TestGetFilteredAutoscalingGroupsVmss(t *testing.T) {
679679
minSize: minVal,
680680
maxSize: maxVal,
681681
manager: manager,
682+
enableForceDelete: manager.config.EnableForceDelete,
682683
curSize: 3,
683684
sizeRefreshPeriod: manager.azureCache.refreshInterval,
684685
instancesRefreshPeriod: defaultVmssInstancesRefreshPeriod,

cluster-autoscaler/cloudprovider/azure/azure_scale_set_test.go

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -535,20 +535,49 @@ func TestDeleteNodeUnregistered(t *testing.T) {
535535
ctrl := gomock.NewController(t)
536536
defer ctrl.Finish()
537537

538-
orchestrationModes := [2]compute.OrchestrationMode{compute.Uniform, compute.Flexible}
539-
540538
vmssName := "test-asg"
541539
var vmssCapacity int64 = 2
542-
expectedVMSSVMs := newTestVMSSVMList(2)
543-
expectedVMs := newTestVMList(2)
544540

545-
for _, orchMode := range orchestrationModes {
541+
cases := []struct {
542+
name string
543+
orchestrationMode compute.OrchestrationMode
544+
enableForceDelete bool
545+
}{
546+
{
547+
name: "uniform, force delete enabled",
548+
orchestrationMode: compute.Uniform,
549+
enableForceDelete: true,
550+
},
551+
{
552+
name: "uniform, force delete disabled",
553+
orchestrationMode: compute.Uniform,
554+
enableForceDelete: false,
555+
},
556+
{
557+
name: "flexible, force delete enabled",
558+
orchestrationMode: compute.Flexible,
559+
enableForceDelete: true,
560+
},
561+
{
562+
name: "flexible, force delete disabled",
563+
orchestrationMode: compute.Flexible,
564+
enableForceDelete: false,
565+
},
566+
}
567+
568+
for _, tc := range cases {
569+
orchMode := tc.orchestrationMode
570+
enableForceDelete := tc.enableForceDelete
571+
expectedVMSSVMs := newTestVMSSVMList(2)
572+
expectedVMs := newTestVMList(2)
573+
546574
manager := newTestAzureManager(t)
575+
manager.config.EnableForceDelete = enableForceDelete
547576
expectedScaleSets := newTestVMSSList(vmssCapacity, vmssName, "eastus", orchMode)
548577

549578
mockVMSSClient := mockvmssclient.NewMockInterface(ctrl)
550579
mockVMSSClient.EXPECT().List(gomock.Any(), manager.config.ResourceGroup).Return(expectedScaleSets, nil).Times(2)
551-
mockVMSSClient.EXPECT().DeleteInstancesAsync(gomock.Any(), manager.config.ResourceGroup, gomock.Any(), gomock.Any(), false).Return(nil, nil)
580+
mockVMSSClient.EXPECT().DeleteInstancesAsync(gomock.Any(), manager.config.ResourceGroup, gomock.Any(), gomock.Any(), enableForceDelete).Return(nil, nil)
552581
mockVMSSClient.EXPECT().WaitForDeleteInstancesResult(gomock.Any(), gomock.Any(), manager.config.ResourceGroup).Return(&http.Response{StatusCode: http.StatusOK}, nil).AnyTimes()
553582
manager.azClient.virtualMachineScaleSetsClient = mockVMSSClient
554583

0 commit comments

Comments
 (0)