Merge pull request #58 from browserstack/bug_fixes

Bug fixes

Author: dhimil

.gitignore

@@ -2,3 +2,4 @@ tmp
 node_modules
 browserstack.json
 browserstack-runner.pid
+lib/BrowserStackLocal

bin/runner.js

@@ -2,12 +2,15 @@
 
 var BrowserStack = require('browserstack'),
     fs = require('fs'),
+    chalk = require('chalk'),
     utils = require('../lib/utils'),
     Server = require('../lib/server').Server,
     config = require('../lib/config'),
     Tunnel = require('../lib/local').Tunnel,
     ConfigParser = require('../lib/configParser').ConfigParser,
     serverPort = 8888,
+    timeout = null,
+    activityTimeout = null,
     tunnel;
 
 var client = BrowserStack.createClient({
@@ -19,7 +22,8 @@ var pid_file = process.cwd() + '/browserstack-run.pid';
 fs.writeFileSync(pid_file, process.pid, 'utf-8')
 
 var workers = {};
-var cleanUp = function cleanUp () {
+var workerKeys = {};
+var cleanUp = function(signal) {
   try {
     server.close();
   } catch (e) {
@@ -29,33 +33,39 @@ var cleanUp = function cleanUp () {
   console.log("Exiting");
 
   for (var key in workers) {
+    var worker = workers[key];
     if (workers.hasOwnProperty(key)) {
-      client.terminateWorker(workers[key].id, function () {
+      client.terminateWorker(worker.id, function () {
         if (!workers[key]) {
           return;
         }
 
-        console.log('[%s] Terminated', workers[key].string);
-        clearTimeout(workers[key].activityTimeout);
-        delete workers[key]
+        console.log('[%s] Terminated', worker.string);
+        clearTimeout(worker.activityTimeout);
+        delete workers[key];
+        delete workerKeys[worker.id];
       });
     }
   }
+  if (statusPoller) statusPoller.stop();
 
   try {
     process.kill(tunnel.process.pid, 'SIGKILL');
   } catch (e) {
     console.log("Non existent tunnel");
   }
   try {
-    fs.unlink(pid_file);
+    fs.unlinkSync(pid_file);
   } catch (e) {
     console.log("Non existent pid file.");
   }
+  if (signal) {
+    process.kill(process.pid, 'SIGTERM');
+  }
 };
 
-process.on('exit', cleanUp);
-process.on('SIGINT', cleanUp);
+process.on('exit', function() {cleanUp(false)});
+process.on('SIGINT', function() {cleanUp(true)});
 
 console.log("Launching server on port:", serverPort);
 
@@ -88,13 +98,13 @@ function launchBrowser(browser, url) {
     browser["tunnel_identifier"] = config.tunnelIdentifier;
   }
 
-  var timeout = parseInt(config.timeout);
+  timeout = parseInt(config.timeout);
   if(! isNaN(timeout)) {
     browser.timeout = timeout;
   } else {
     timeout = 300;
   }
-  var activityTimeout = timeout - 10;
+  activityTimeout = timeout - 10;
 
   client.createWorker(browser, function (err, worker) {
     if (err || typeof worker !== 'object') {
@@ -110,47 +120,9 @@ function launchBrowser(browser, url) {
     worker.config = browser;
     worker.string = browserString;
     workers[key] = worker;
-
-    var statusPoller = setInterval(function () {
-      client.getWorker(worker.id, function (err, _worker) {
-        if (worker.launched) {
-          return;
-        }
-
-        if (_worker.status === 'running') {
-          clearInterval(statusPoller);
-          console.log('[%s] Launched', worker.string);
-          worker.launched = true;
-
-          worker.activityTimeout = setTimeout(function () {
-            if (!worker.acknowledged) {
-              var subject = "Worker inactive for too long: " + worker.string;
-              var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
-              client.takeScreenshot(worker.id, function(error, screenshot) {
-                if (!error && screenshot.url) {
-                  console.log('[%s] Screenshot: %s', worker.string, screenshot.url);
-                }
-                utils.alertBrowserStack(subject, content);
-              });
-            }
-          }, activityTimeout * 1000);
-
-          setTimeout(function () {
-            if (workers[key]) {
-              var subject = "Tests timed out on: " + worker.string;
-              var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
-              client.takeScreenshot(worker.id, function(error, screenshot) {
-                if (!error && screenshot.url) {
-                  console.log('[%s] Screenshot: %s', worker.string, screenshot.url);
-                }
-                utils.alertBrowserStack(subject, content);
-              });
-            }
-          }, (activityTimeout * 1000));
-        }
-      });
-    }, 2000);
+    workerKeys[worker.id] = {key: key, marked: false};
   });
+
 }
 
 var launchBrowsers = function(config, browser) {
@@ -167,6 +139,81 @@ var launchBrowsers = function(config, browser) {
   }, 100);
 }
 
+var statusPoller = {
+  poller: null,
+
+  start: function() {
+    statusPoller.poller = setInterval(function () {
+      client.getWorkers(function (err, _workers) {
+        _workers = _workers.filter(function(currentValue, index, array) {
+          return currentValue.status == 'running' && workerKeys[currentValue.id] && !workerKeys[currentValue.id].marked;
+        });
+        for (var i in _workers) {
+          var _worker = _workers[i];
+          var workerData = workerKeys[_worker.id];
+          var worker = workers[workerData.key];
+          if (worker.launched) {
+            return;
+          }
+
+          if (_worker.status === 'running') {
+            //clearInterval(statusPoller);
+            console.log('[%s] Launched', worker.string);
+            worker.launched = true;
+            workerData.marked = true;
+
+            worker.activityTimeout = setTimeout(function () {
+              if (!worker.acknowledged) {
+                var subject = "Worker inactive for too long: " + worker.string;
+                var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
+                utils.alertBrowserStack(subject, content, null, function(){});
+                delete workers[workerData.key];
+                delete workerKeys[worker.id];
+                config.status += 1;
+                if (utils.objectSize(workers) === 0) {
+                  var color = config.status > 0 ? "red" : "green";
+                  console.log(chalk[color]("All tests done, failures: %d."), config.status);
+
+                  if (config.status > 0) {
+                    config.status = 1;
+                  }
+
+                  process.exit(config.status);
+                }
+              }
+            }, activityTimeout * 1000);
+
+            setTimeout(function () {
+              if (worker.acknowledged) {
+                var subject = "Tests timed out on: " + worker.string;
+                var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
+                utils.alertBrowserStack(subject, content, null, function(){});
+                delete workers[workerData.key];
+                delete workerKeys[worker.id];
+                config.status += 1;
+                if (utils.objectSize(workers) === 0) {
+                  var color = config.status > 0 ? "red" : "green";
+                  console.log(chalk[color]("All tests done, failures: %d."), config.status);
+
+                  if (config.status > 0) {
+                    config.status = 1;
+                  }
+
+                  process.exit(config.status);
+                }
+              }
+            }, (activityTimeout * 1000));
+          }
+        }
+      });
+    }, 2000);
+  },
+  
+  stop: function() {
+    clearInterval(statusPoller.poller);
+  }
+};
+
 if (config.browsers && config.browsers.length > 0) {
   ConfigParser.parse(client, config.browsers, function(browsers){
     tunnel = new Tunnel(config.key, serverPort, config.tunnelIdentifier, function () {
@@ -187,5 +234,6 @@ if (config.browsers && config.browsers.length > 0) {
         }
       });
     });
+    statusPoller.start();
   });
 }

lib/_patch/browserstack.js

@@ -29,8 +29,6 @@
     req.setRequestHeader('X-Browser-String', BrowserStack.browser_string);
     req.setRequestHeader('X-Worker-UUID', BrowserStack.worker_uuid);
     req.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
-    req.setRequestHeader('Content-length',  data.length);
-    req.setRequestHeader('Connection', 'close');
     req.send(data);
   }
 

lib/config.js

@@ -78,6 +78,8 @@ if (Object.prototype.toString.call(config.test_path) === '[object Array]') {
   config.test_path = formatPath(config.test_path);
 }
 
+config.status = 0;
+
 for (var key in config) {
   if (config.hasOwnProperty(key)) {
     exports[key] = config[key];

lib/configParser.js

@@ -32,7 +32,7 @@ var ConfigParser = {
     }).sort(function(a, b) {
       return parseFloat(a) - parseFloat(b);
     });
-    if (verStr == 'current') {
+    if (verStr == 'current' || verStr == 'latest') {
       return filteredBrowsers[filteredBrowsers.length - 1];
     }
     else if (verStr == 'previous') {
@@ -82,7 +82,7 @@ var ConfigParser = {
         browserObject.browser = browserData[0];
       }
       if (browserData[lindex] && browserData[lindex].indexOf("+") == -1) {
-        if (["current", "previous"].indexOf(browserData[lindex]) != -1) {
+        if (["current", "previous", "latest"].indexOf(browserData[lindex]) != -1) {
           version = ConfigParser.setBrowserVersion(browserObject, browserData[lindex]);
         }
         else {

lib/local.js

@@ -26,7 +26,7 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
     var subProcess = exec(tunnelCommand, function(error, stdout, stderr) {
       console.log(stderr);
       console.log(error);
-      if (stdout.indexOf('Error') >= 0) {
+      if (stdout.indexOf('Error') >= 0 || error) {
         console.log("[%s] Tunnel launching failed", new Date());
         console.log(stdout);
         process.exit(1);
@@ -78,6 +78,9 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
         setTimeout(function() {
           tunnelLauncher();
         }, 100);
+      }).on('error', function(e) {
+        console.log("Got error while downloading binary: " + e.message);
+        process.exit(1);
       });
     });
   });

lib/server.js

@@ -20,7 +20,6 @@ var mimeTypes = {
 
 
 exports.Server = function Server(bsClient, workers) {
-  var status = 0;
 
   function handleFile(filename, request, response) {
     var url_parts = url.parse(request.url, true);
@@ -171,7 +170,7 @@ exports.Server = function Server(bsClient, workers) {
         }
         var color = query.failed ? "red" : "green";
         console.log(chalk[color]("[%s] Completed in %d milliseconds. %d of %d passed, %d failed."), request.headers['x-browser-string'], query.runtime, query.passed, query.total, query.failed);
-        status += query.failed;
+        config.status += query.failed;
       }
 
       if (worker) {
@@ -191,14 +190,14 @@ exports.Server = function Server(bsClient, workers) {
             delete workers[uuid];
 
             if (utils.objectSize(workers) === 0) {
-              var color = status > 0 ? "red" : "green";
-              console.log(chalk[color]("All tests done, failures: %d."), status);
+              var color = config.status > 0 ? "red" : "green";
+              console.log(chalk[color]("All tests done, failures: %d."), config.status);
 
-              if (status > 0) {
-                status = 1;
+              if (config.status > 0) {
+                config.status = 1;
               }
 
-              process.exit(status);
+              process.exit(config.status);
             }
           });
         });

lib/utils.js

@@ -52,7 +52,7 @@ var alertBrowserStack = function alertBrowserStack(subject, content, params, fn)
     }
   }
 
-  if (typeof params !== 'object') {
+  if (!params || typeof(params) !== 'object') {
     params = {};
   }
 

package.json

@@ -5,7 +5,7 @@
   "homepage": "https://github.com/browserstack/browserstack-runner",
   "repository": {
     "type": "git",
-    "url": "git://github.com/browserstack/browserstack-runner.git"
+    "url": "https://github.com/browserstack/browserstack-runner.git"
   },
   "dependencies": {
     "browserstack": "1.0.1",