Skip to content

Commit ee78b49

Browse files
committed
small stuff, copilot suggestions
1 parent 0af5fea commit ee78b49

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COMMIT = $(shell git rev-parse --short=7 HEAD)$(shell [[ $$(git status --porcela
99
ARO_IMAGE_BASE = ${RP_IMAGE_ACR}.azurecr.io/aro
1010
E2E_FLAGS ?= -test.v --ginkgo.vv --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml
1111
E2E_LABEL ?= !smoke&&!regressiontest
12-
E2E_FOKUS ?= *
12+
E2E_FOKUS ?=
1313
GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper
1414
OC ?= oc
1515

test/e2e/adminapi_resize_controlplane.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func getControlPlaneVMs(ctx context.Context) []compute.VirtualMachine {
4242
clusterResourceGroup := stringutils.LastTokenByte(*oc.ClusterProfile.ResourceGroupID, '/')
4343
vms, err := clients.VirtualMachines.List(ctx, clusterResourceGroup)
4444
Expect(err).NotTo(HaveOccurred())
45-
4645
return slices.DeleteFunc(vms, func(vm compute.VirtualMachine) bool {
46+
Expect(vm.Name).ToNot(BeNil())
4747
return !strings.Contains(*vm.Name, "master")
4848
})
4949
}
@@ -54,6 +54,7 @@ func getControlPlaneVMs(ctx context.Context) []compute.VirtualMachine {
5454
func getControlPlaneVMSize(ctx context.Context) string {
5555
vms := getControlPlaneVMs(ctx)
5656
Expect(vms).NotTo(BeEmpty())
57+
Expect(vms[0].HardwareProfile).NotTo(BeNil())
5758
return string(vms[0].HardwareProfile.VMSize)
5859
}
5960

@@ -198,7 +199,7 @@ var _ = Describe("[Admin API] Resize control plane", func() {
198199
} else if strings.HasPrefix(preResizeVMSize, "Standard_E") {
199200
targetSku = strings.Replace(preResizeVMSize, "Standard_E", "Standard_D", 1)
200201
} else {
201-
Skip(fmt.Sprintf("Cowardly refusing to resize the cluster, only know how to hande E and D vms, this cluster has: %s", preResizeVMSize))
202+
Skip(fmt.Sprintf("Cowardly refusing to resize the cluster, only know how to handle E and D vms, this cluster has: %s", preResizeVMSize))
202203
}
203204

204205
By(fmt.Sprintf("Resizing from %s to %s", preResizeVMSize, targetSku))
@@ -225,7 +226,7 @@ var _ = Describe("[Admin API] Resize control plane", func() {
225226
Expect(vm.HardwareProfile).ToNot(BeNil())
226227
Expect(string(vm.HardwareProfile.VMSize)).To(Equal(targetSku))
227228
Expect(vm.ProvisioningState).ToNot(BeNil())
228-
Expect(*vm.ProvisioningState).ToNot(Equal(string(compute.ProvisioningStateSucceeded)))
229+
Expect(*vm.ProvisioningState).To(Equal(string(compute.ProvisioningStateSucceeded)))
229230
}
230231

231232
By("Validating machine and node labels")

0 commit comments

Comments
 (0)