Skip to content
This repository has been archived by the owner on Jul 17, 2019. It is now read-only.

Commit

Permalink
try to run next also when task is rejected
Browse files Browse the repository at this point in the history
  • Loading branch information
moeriki committed Nov 9, 2016
1 parent 6bae0bd commit 7a27c59
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
11 changes: 6 additions & 5 deletions __test__/index.test.js
Expand Up @@ -13,6 +13,7 @@ const utils = require('./__utils__');
const WAITING = utils.WAITING;
const RUNNING = utils.RUNNING;
const RESOLVED = utils.RESOLVED;
const REJECTED = utils.REJECTED;
const deferred = utils.deferred;

// private variables
Expand Down Expand Up @@ -107,24 +108,24 @@ it('should respect concurrency', async () => {
const defer1 = deferred();
const defer2 = deferred();
const defer3 = deferred();
const result = queue.push(defer1, defer2, defer3);
const result = queue.push(defer1, defer2, defer3).catch(() => { /* ok to swallow */ });
await delay(TIMEOUT);
expect(defer1.status).toBe(RUNNING);
expect(defer2.status).toBe(RUNNING);
expect(defer3.status).toBe(WAITING);
defer1.resolve();
defer1.reject();
await delay(TIMEOUT);
expect(defer1.status).toBe(RESOLVED);
expect(defer1.status).toBe(REJECTED);
expect(defer2.status).toBe(RUNNING);
expect(defer3.status).toBe(RUNNING);
defer2.resolve();
await delay(TIMEOUT);
expect(defer1.status).toBe(RESOLVED);
expect(defer1.status).toBe(REJECTED);
expect(defer2.status).toBe(RESOLVED);
expect(defer3.status).toBe(RUNNING);
defer3.resolve();
await delay(TIMEOUT);
expect(defer1.status).toBe(RESOLVED);
expect(defer1.status).toBe(REJECTED);
expect(defer2.status).toBe(RESOLVED);
expect(defer3.status).toBe(RESOLVED);
await result;
Expand Down
4 changes: 3 additions & 1 deletion index.js
Expand Up @@ -78,10 +78,12 @@ function qute(options) {
.then((result) => {
pendingCount--;
item.resolve(result);
defer(tryToRunNext);
}, (err) => {
pendingCount--;
item.reject(err);
})
.then(() => {
defer(tryToRunNext);
});

defer(tryToRunNext);
Expand Down

0 comments on commit 7a27c59

Please sign in to comment.