Merge pull request #13080 from Budibase/fix-flaky-backup-test

Ensure a backup is complete before attempting to import it.

packages/server/src/api/routes/tests/backup.spec.ts

@@ -8,7 +8,6 @@ import { mocks } from "@budibase/backend-core/tests"
 mocks.licenses.useBackups()
 
 describe("/backups", () => {
-  let request = setup.getRequest()
   let config = setup.getConfig()
 
   afterAll(setup.afterAll)
@@ -59,10 +58,8 @@ describe("/backups", () => {
       await config.createScreen()
       const exportRes = await config.api.backup.createBackup(appId)
       expect(exportRes.backupId).toBeDefined()
-      const importRes = await config.api.backup.importBackup(
+      await config.api.backup.waitForBackupToComplete(appId, exportRes.backupId)
-        appId,
+      await config.api.backup.importBackup(appId, exportRes.backupId)
-        exportRes.backupId
-      )
     })
   })
 

packages/server/src/tests/utilities/api/backup.ts

@@ -31,6 +31,19 @@ export class BackupAPI extends TestAPI {
     return result.body as CreateAppBackupResponse
   }
 
+  waitForBackupToComplete = async (appId: string, backupId: string) => {
+    for (let i = 0; i < 10; i++) {
+      await new Promise(resolve => setTimeout(resolve, 1000))
+      const result = await this.request
+        .get(`/api/apps/${appId}/backups/${backupId}/file`)
+        .set(this.config.defaultHeaders())
+      if (result.status === 200) {
+        return
+      }
+    }
+    throw new Error("Backup did not complete")
+  }
+
   importBackup = async (
     appId: string,
     backupId: string