Fixed a problem with the request retries in case of a timeout

lib/http/request.js

@@ -94,6 +94,8 @@ module.exports = (function() {
   HttpRequest.prototype.send = function() {
     var self = this;
     var startTime = new Date();
+    var isAborted = false;
+
     this.request = (Settings.use_ssl ? https: http).request(this.reqOptions, function (response) {
       response.setEncoding('utf8');
       var redirected = false;
@@ -158,6 +160,9 @@ module.exports = (function() {
         }
 
         if (response.statusCode.toString().indexOf('2') === 0 || redirected) {
+          if (isAborted) {
+            return;
+          }
           self.emit('success', result, response, redirected);
         } else {
           self.emit('error', result, response, screenshotContent);
@@ -170,11 +175,13 @@ module.exports = (function() {
     });
 
     this.request.setTimeout(this.timeout, function() {
-      self.request.abort();
-
       if (self.retryAttempts) {
+        self.request.socket.unref();
+        isAborted = true; // prevent emitting of the success event multiple times.
         self.retryAttempts = self.retryAttempts - 1;
         self.send();
+      } else {
+        self.request.abort();
       }
     });
 

lib/index.js

@@ -134,7 +134,7 @@ Nightwatch.prototype.setOptions = function(options) {
   if (typeof timeoutOptions.timeout != 'undefined') {
     HttpRequest.setTimeout(timeoutOptions.timeout);
   }
-    if (typeof timeoutOptions.retry_attempts != 'undefined') {
+  if (typeof timeoutOptions.retry_attempts != 'undefined') {
     HttpRequest.setRetryAttempts(timeoutOptions.retry_attempts);
   }
 

lib/runner/clientmanager.js

@@ -1,4 +1,5 @@
 var util = require('util');
+var http = require('http');
 var events = require('events');
 var Q = require('q');
 var Nightwatch = require('../index.js');
@@ -49,9 +50,17 @@ ClientManager.prototype.start = function(done) {
   });
 
   this['@client'].once('error', function(error, data) {
+    var errorMsg = error || data;
+    if (errorMsg instanceof http.IncomingMessage) {
+      errorMsg = {
+        statusCode : error.statusCode,
+        headers : error.headers
+      };
+    }
+
     var result = {
       message: 'Connection refused! Is selenium server started?\n',
-      data : error || data
+      data : errorMsg
     };
 
     self.emit('error', result, false);

test/src/http/testRequestTimeout.js

@@ -75,8 +75,7 @@ module.exports = {
 
       request
         .on('error', function(res, err) {
-          assert.strictEqual(request.retryAttempts, 0);
-          assert.ok(err instanceof Error); // the 'socket hang up' error, caused by aborting the request
+          done(err);
         })
         .on('success', function (result) {
           assert.strictEqual(request.retryAttempts, 0);