Merge pull request #8 from maxfierke/mf-fix_off_by_one

Fixed off-by-one error in DelayPolicy
maxfierke · Mar 2, 2019 · 95ca712 · 95ca712
2 parents b9377c9 + 9b1fba6
commit 95ca712
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/addon/policies/delay.js b/addon/policies/delay.js
@@ -68,7 +68,9 @@ export default class DelayPolicy extends Policy {
    */
   *retry(retryInstance) {
     const retryCount = get(retryInstance, 'retryCount');
-    const currentDelayMs = this.delay[retryCount];
+    const currentDelayMs = this.delay[retryCount - 1];
+
+    assert("DelayPolicy.delay was unexpectedly exhausted.", Number.isFinite(currentDelayMs));
 
     yield timeout(currentDelayMs);
     return yield* super.retry(retryInstance);

diff --git a/tests/unit/policies/delay-test.js b/tests/unit/policies/delay-test.js
@@ -94,14 +94,14 @@ module('Unit: DelayPolicy', function() {
 
     assert.equal(taskAttemptCounter, 0);
 
-    run(() => {
+    later(() => {
       obj = Obj.create();
       obj.get('doStuff').perform().catch((e) => {
         assert.equal(e.message, "I will never complete", "expected to have thrown original error");
         assert.equal(taskAttemptCounter, 4, "expected to have been run four times");
         done();
       });
       assert.equal(taskAttemptCounter, 1);
-    });
+    }, 620);
   });
 });
diff --git a/tests/unit/policies/exponential-backoff-test.js b/tests/unit/policies/exponential-backoff-test.js
@@ -131,14 +131,14 @@ module('Unit: ExponentialBackoffPolicy', function() {
 
     assert.equal(taskAttemptCounter, 0);
 
-    run(() => {
+    later(() => {
       obj = Obj.create();
       obj.get('doStuff').perform().catch((e) => {
         assert.equal(e.message, "I will never complete", "expected to have thrown original error");
         assert.equal(taskAttemptCounter, 7, "expected to have been run seven times");
         done();
       });
       assert.equal(taskAttemptCounter, 1);
-    });
+    }, 10 + 20 + 40 + 80 + 160 + 320);
   });
 });