From f34077742dc3f9becf3dd2efff2ca970ca2aee8b Mon Sep 17 00:00:00 2001
From: Denis DelGrosso <85250797+ddelgrosso1@users.noreply.github.com>
Date: Fri, 18 Aug 2023 09:51:02 -0400
Subject: [PATCH] test: add additional delay before deleting objects in
 rentention tests (#2279)

* test: add additional delay before deleting objects in rentention tests

* add additional step to remove retention policy

* simplify logic

* fix lint
---
 system-test/storage.ts | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/system-test/storage.ts b/system-test/storage.ts
index 042403e43..3e39fbf56 100644
--- a/system-test/storage.ts
+++ b/system-test/storage.ts
@@ -1530,23 +1530,11 @@ describe('storage', () => {
 
       async function createFile(): Promise<File> {
         const file = BUCKET.file(generateName());
-        FILES.push(file);
         await file.save('data');
+        FILES.push(file);
         return file;
       }
 
-      async function deleteFilesAsync() {
-        await new Promise(resolve =>
-          setTimeout(resolve, RETENTION_PERIOD_SECONDS * 1000)
-        );
-        return Promise.all(
-          FILES.map(async file => {
-            await file.setMetadata({temporaryHold: null});
-            return file.delete();
-          })
-        );
-      }
-
       before(async () => {
         await BUCKET.create({
           retentionPolicy: {
@@ -1555,8 +1543,15 @@ describe('storage', () => {
         });
       });
 
-      after(() => {
-        return deleteFilesAsync();
+      after(async () => {
+        await new Promise(resolve =>
+          setTimeout(resolve, RETENTION_PERIOD_SECONDS * 1000)
+        );
+        await Promise.all(
+          FILES.map(async file => {
+            return file.delete();
+          })
+        );
       });
 
       it('should block an overwrite request', async () => {