Merge pull request #72 from browserstack/bug_fixes

Bug fixes

Author: nakula

bin/cli.js

@@ -5,6 +5,11 @@ if (process.argv[2] == '--verbose')
 else
   global.logLevel = "info";
 
+if (process.argv[2] == 'init') {
+  require('./init.js');
+  return;
+}
+
 var Log = require('../lib/logger'),
     logger = new Log(global.logLevel),
     BrowserStack = require('browserstack'),
@@ -30,6 +35,7 @@ function terminateAllWorkers(callback) {
       if(worker) {
         logger.debug('[%s] Terminated', worker.string);
         clearTimeout(worker.activityTimeout);
+        clearTimeout(worker.testActivityTimeout);
         delete workers[key];
         delete workerKeys[worker.id];
       }
@@ -215,7 +221,7 @@ var statusPoller = {
               }
             }, activityTimeout * 1000);
 
-            setTimeout(function () {
+            worker.testActivityTimeout = setTimeout(function () {
               if (worker.acknowledged) {
                 var subject = "Tests timed out on: " + worker.string;
                 var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
@@ -275,21 +281,16 @@ function runTests() {
 }
 
 try {
-  if (process.argv[2] == 'init') {
-    require('./init.js');
-  } else {
-    var client = BrowserStack.createClient({
-      username: config.username,
-      password: config.key
-    });
-    runTests();
-    var pid_file = process.cwd() + '/browserstack-run.pid';
-    fs.writeFileSync(pid_file, process.pid, 'utf-8')
-    process.on('SIGINT', function() { cleanUpAndExit('SIGINT', 1) });
-    process.on('SIGTERM', function() { cleanUpAndExit('SIGTERM', config.status) });
-  }
+  var client = BrowserStack.createClient({
+    username: config.username,
+    password: config.key
+  });
+  runTests();
+  var pid_file = process.cwd() + '/browserstack-run.pid';
+  fs.writeFileSync(pid_file, process.pid, 'utf-8')
+  process.on('SIGINT', function() { cleanUpAndExit('SIGINT', 1) });
+  process.on('SIGTERM', function() { cleanUpAndExit('SIGTERM', config.status) });
 } catch (e) {
   console.log(e);
   console.log('Invalid command.');
 }
-

lib/server.js

@@ -198,6 +198,7 @@ exports.Server = function Server(bsClient, workers) {
             logger.debug('[%s] Terminated', getTestBrowserInfo(worker));
 
             clearTimeout(workers[uuid].activityTimeout);
+            clearTimeout(workers[uuid].testActivityTimeout);
             delete workers[uuid];
 
             if (utils.objectSize(workers) === 0) {

lib/utils.js

@@ -26,7 +26,7 @@ var uuid = function uuidGenerator() {
 };
 
 var browserString = function browserString(config) {
-  return config.os + ' ' + config.os_version + ', ' + titleCase(config.browser || config.device) + ' ' + (config.browser_version || config.device);
+  return config.os + ' ' + config.os_version + ', ' + (config.browser == 'ie' ? 'IE' : titleCase(config.browser || config.device)) + ' ' + (config.browser_version || config.device);
 };
 
 var objectSize = function objectSize(obj) {