Re-add clean-up for gRPC tests

Author: friegger

internal/server/machine_create_test.go

@@ -93,10 +93,7 @@ var _ = Describe("CreateMachine", func() {
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Expect(createResp).NotTo(BeNil())
-		DeferCleanup(func() {
-			err := machineStore.Delete(ctx, createResp.Machine.Metadata.Id)
-			Expect(err).NotTo(HaveOccurred())
-		})
+		DeferCleanup(cleanupMachine(createResp.Machine.Metadata.Id))
 
 		By("ensuring the correct creation response")
 		Expect(createResp).Should(SatisfyAll(

internal/server/server_suite_test.go

@@ -217,3 +217,17 @@ func isSocketAvailable(socketPath string) error {
 	}
 	return fmt.Errorf("socket %s is not available", socketPath)
 }
+
+func cleanupMachine(machineID string) func(SpecContext) {
+	return func(ctx SpecContext) {
+		By(fmt.Sprintf("Cleaning up machine ID=%s", machineID))
+		Eventually(func(g Gomega) error {
+			err := machineStore.Delete(context.Background(), machineID)
+			GinkgoWriter.Printf("Deleting machine ID=%s: err=%v\n", machineID, err)
+			if success, _ := MatchError(ContainSubstring("no such file or directory")).Match(err); success {
+				return nil
+			}
+			return err
+		}).Should(Succeed())
+	}
+}