test/integration/s3: clean up after failed test (#1213)

* Demonstrate tests hanging * working * remove .only()s * lint --------- Co-authored-by: alxndrsn <alxndrsn>
getodk · Oct 7, 2024 · 1f93aa4 · 1f93aa4
1 parent 6b456d6
commit 1f93aa4
Showing 1 changed file with 43 additions and 31 deletions.
diff --git a/test/integration/task/s3.js b/test/integration/task/s3.js
@@ -169,41 +169,53 @@ describe('task: s3', () => {
         (await container.Audits.getLatestByAction('blobs.s3.upload')).get().details.should.containEql({ uploaded: 1, failed: 0 });
       }));
 
-      it('should not attempt to upload an in-progress blob', testTaskFullTrx(async (container) => {
-        // given
-        const original = global.s3.uploadFromBlob;
-        let resume;
-        global.s3.uploadFromBlob = async (...args) => {
-          await new Promise(resolve => {
-            resume = resolve;
-          });
-          original.apply(global.s3, args);
-        };
-        await aBlobExistsWith(container, { status: 'pending' });
+      describe('with delayed s3 upload', () => {
+        let restoreS3mock;
+        let resumeFirstUpload;
 
-        // when
-        const first = uploadPending();
-        await new Promise(resolve => { setTimeout(resolve, 200); });
-        if (!resume) should.fail('Test did not set up successfully');
-        global.s3.uploadFromBlob = original;
-        // and
-        const second = uploadPending();
-        await second;
+        beforeEach(() => {
+          const original = global.s3.uploadFromBlob;
+          restoreS3mock = () => { global.s3.uploadFromBlob = original; };
+
+          global.s3.uploadFromBlob = async (...args) => {
+            await new Promise(resolve => {
+              resumeFirstUpload = resolve;
+            });
+            original.apply(global.s3, args);
+          };
+        });
 
-        // then
-        global.s3.uploads.attempted.should.equal(0);
-        global.s3.uploads.successful.should.equal(0);
-        (await container.Audits.getLatestByAction('blobs.s3.upload')).isDefined().should.equal(false);
+        afterEach(() => {
+          restoreS3mock();
+        });
 
-        // when
-        resume();
-        await first;
+        it('should not attempt to upload an in-progress blob', testTaskFullTrx(async (container) => {
+          await aBlobExistsWith(container, { status: 'pending' });
 
-        // then
-        global.s3.uploads.attempted.should.equal(1);
-        global.s3.uploads.successful.should.equal(1);
-        (await container.Audits.getLatestByAction('blobs.s3.upload')).get().details.should.containEql({ uploaded: 1, failed: 0 });
-      }));
+          // when
+          const first = uploadPending();
+          await new Promise(resolve => { setTimeout(resolve, 200); });
+          should(resumeFirstUpload).be.a.Function(); // or Blobs.s3UploadPending() never triggered
+          restoreS3mock();
+          // and
+          const second = uploadPending();
+          await second;
+
+          // then
+          global.s3.uploads.attempted.should.equal(0);
+          global.s3.uploads.successful.should.equal(0);
+          (await container.Audits.getLatestByAction('blobs.s3.upload')).isDefined().should.equal(false);
+
+          // when
+          resumeFirstUpload();
+          await first;
+
+          // then
+          global.s3.uploads.attempted.should.equal(1);
+          global.s3.uploads.successful.should.equal(1);
+          (await container.Audits.getLatestByAction('blobs.s3.upload')).get().details.should.containEql({ uploaded: 1, failed: 0 });
+        }));
+      });
 
       describe('with limit', () => {
         let originalLog;