return error from DeleteMachine in eventually blocks

ironcore-dev · Mar 21, 2024 · 1e7e3db · 1e7e3db
1 parent d560d5f
commit 1e7e3db
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/provider/server/exec_test.go b/provider/server/exec_test.go
@@ -38,13 +38,13 @@ var _ = Describe("Exec", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).To(SatisfyAny(
-					BeNil(),
-					MatchError(ContainSubstring("NotFound")),
-				))
-			}).Should(Succeed())
+				return err
+			}).Should(SatisfyAny(
+				BeNil(),
+				MatchError(ContainSubstring("NotFound")),
+			))
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
 				return libvirt.IsNotFound(err)

diff --git a/provider/server/machine_annotations_update_test.go b/provider/server/machine_annotations_update_test.go
@@ -36,9 +36,9 @@ var _ = Describe("UpdateMachineAnnotations", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_create_test.go b/provider/server/machine_create_test.go
@@ -54,9 +54,9 @@ var _ = Describe("CreateMachine", func() {
 		))
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
@@ -158,9 +158,9 @@ var _ = Describe("CreateMachine", func() {
 		))
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
@@ -274,9 +274,9 @@ var _ = Describe("CreateMachine", func() {
 		))
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))
@@ -404,9 +404,9 @@ var _ = Describe("CreateMachine", func() {
 		))
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_list_test.go b/provider/server/machine_list_test.go
@@ -42,9 +42,9 @@ var _ = Describe("ListMachine", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_networkinterface_attach_test.go b/provider/server/machine_networkinterface_attach_test.go
@@ -40,9 +40,9 @@ var _ = Describe("AttachNetworkInterface", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_networkinterface_detach_test.go b/provider/server/machine_networkinterface_detach_test.go
@@ -58,9 +58,9 @@ var _ = Describe("DetachNetworkInterface", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_powerstate_update_test.go b/provider/server/machine_powerstate_update_test.go
@@ -37,9 +37,9 @@ var _ = Describe("UpdateMachinePower", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_volume_attach_test.go b/provider/server/machine_volume_attach_test.go
@@ -35,9 +35,9 @@ var _ = Describe("AttachVolume", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))

diff --git a/provider/server/machine_volume_detach_test.go b/provider/server/machine_volume_detach_test.go
@@ -70,9 +70,9 @@ var _ = Describe("DetachVolume", func() {
 		Expect(createResp).NotTo(BeNil())
 
 		DeferCleanup(func(ctx SpecContext) {
-			Eventually(func(g Gomega) {
+			Eventually(func() error {
 				_, err := machineClient.DeleteMachine(ctx, &iri.DeleteMachineRequest{MachineId: createResp.Machine.Metadata.Id})
-				g.Expect(err).Should(Succeed())
+				return err
 			}).Should(Succeed())
 			Eventually(func() bool {
 				_, err = libvirtConn.DomainLookupByUUID(libvirtutils.UUIDStringToBytes(createResp.Machine.Metadata.Id))