Fixes #64 and also resolves #5

Author: rahulnwn

bin/cli.js

@@ -35,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];
       }
@@ -220,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);
@@ -293,4 +294,3 @@ try {
   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) {