Skip delay for failures in last try (#86)

Co-authored-by: kali <[email protected]>
blend · Feb 16, 2023 · 1d8167b · 1d8167b
1 parent 6a58d46
commit 1d8167b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blend-promise-utils",
-  "version": "1.29.0",
+  "version": "1.29.1",
   "author": "Blend",
   "license": "MIT",
   "homepage": "https://blend.github.io/promise-utils",

diff --git a/src/retry.ts b/src/retry.ts
@@ -39,7 +39,7 @@ export function retry<T extends Function>(fn: T, retryOpts: RetryOpts): T {
         }
         lastErr = err;
       }
-      if (retryOpts.delayMs) {
+      if (retryOpts.delayMs && i < retryOpts.maxAttempts - 1) {
         await delay(retryOpts.delayMs);
       }
     }

diff --git a/test/retry.test.ts b/test/retry.test.ts
@@ -7,16 +7,22 @@ import * as promiseUtils from '../src/index';
 
 const sandbox = sinon.createSandbox();
 
+test.afterEach(() => sandbox.restore());
+
 test('fails eventually', async t => {
+  const maxAttempts = 3;
+  const delayStub = sandbox.stub(delay, 'delay');
+
   await t.throwsAsync(
     promiseUtils.retry(
       () => {
         throw new Error('testing failures');
       },
-      { maxAttempts: 3 },
+      { maxAttempts: 3, delayMs: 100 },
     ),
     /testing failure/,
   );
+  t.is(delayStub.callCount, maxAttempts - 1);
 });
 
 test('honors immediate failure scenarios', async t => {