call callback at the end of all required responses or if there is an …

…error
artilleryio · May 10, 2017 · aa39e6c · aa39e6c
1 parent 0c0f814
commit aa39e6c
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/engine_socketio.js b/lib/engine_socketio.js
@@ -197,11 +197,15 @@ SocketIoEngine.prototype.step = function (requestSpec, ee) {
             if (!err) {
               markEndTime(ee, context, startedAt);
             }
-            // Stop listening on the response channel only if all messages were received
-            if (requiredResponsesCountsByChannel[channel] - 1 === index) {
+            // Stop listening on the response channel only if all messages were received or if there is an error
+            if (requiredResponsesCountsByChannel[channel] - 1 === index || err) {
               socketio.off(channel);
             }
-            return callback(err, context);
+
+            // Call the callback function if all channel messages were received or if there is an error
+            if (requiredResponsesCount === currentResponsesCount || err) {
+              callback(err, context);
+            }
           });
         });
       });