fix(queue): fix an idle bug

suguru03 · Jun 12, 2017 · a0e1f3b · a0e1f3b
1 parent 0a440ba
commit a0e1f3b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/lib/async.js b/lib/async.js
@@ -7853,11 +7853,11 @@
     function runQueue() {
       while (!q.paused && workers < q.concurrency && q._tasks.length) {
         var task = q._tasks.shift();
+        workers++;
+        workersList.push(task);
         if (q._tasks.length === 0) {
           q.empty();
         }
-        workers++;
-        workersList.push(task);
         if (workers === q.concurrency) {
           q.saturated();
         }
@@ -7875,11 +7875,11 @@
         while (++index < size) {
           data[index] = tasks[index].data;
         }
+        workers++;
+        Array.prototype.push.apply(workersList, tasks);
         if (q._tasks.length === 0) {
           q.empty();
         }
-        workers++;
-        Array.prototype.push.apply(workersList, tasks);
         if (workers === q.concurrency) {
           q.saturated();
         }

diff --git a/test/controlFlow/test.queue.js b/test/controlFlow/test.queue.js
@@ -1016,4 +1016,28 @@ parallel('#priorityQueue', function() {
     }, 50);
   });
 
+  it('should not be idle when empty is called', function(done) {
+    var calls = [];
+    var worker = function(task, cb) {
+      calls.push('process ' + task);
+      async.setImmediate(cb);
+    };
+    var q = async.queue(worker, 1);
+
+    q.empty = function () {
+      calls.push('empty');
+      assert(q.idle() === false, 'tasks should be running when empty is called')
+      assert.strictEqual(q.running(), 1);
+    };
+
+    q.drain = function() {
+      assert.deepEqual(calls, [
+        'empty',
+        'process 1',
+      ]);
+      done();
+    };
+    q.push(1);
+  });
+
 });