Merge pull request #33 from browserstack/timeout_fixes

Timeout fixes

Author: nakula

bin/runner.js

@@ -94,6 +94,7 @@ function launchBrowser(browser, url) {
   } else {
     timeout = 300;
   }
+  var activityTimeout = timeout - 10;
 
   client.createWorker(browser, function (err, worker) {
     if (err || typeof worker !== 'object') {
@@ -125,18 +126,27 @@ function launchBrowser(browser, url) {
             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);
+              client.takeScreenshot(worker.id, function(error, screenshot) {
+                if (!error && screenshot.url) {
+                  console.log('[%s] Screenshot: %s', worker.string, screenshot.url);
+                }
+                utils.alertBrowserStack(subject, content);
+              });
             }
-          }, timeout * 1000);
+          }, 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);
-              utils.alertBrowserStack(subject, content);
+              client.takeScreenshot(worker.id, function(error, screenshot) {
+                if (!error && screenshot.url) {
+                  console.log('[%s] Screenshot: %s', worker.string, screenshot.url);
+                }
+                utils.alertBrowserStack(subject, content);
+              });
             }
-          }, (timeout * 1000));
+          }, (activityTimeout * 1000));
         }
       });
     }, 2000);

lib/server.js

@@ -137,30 +137,30 @@ exports.Server = function Server(bsClient, workers) {
       if (worker) {
         bsClient.takeScreenshot(worker.id,function(error,screenshot){
           if(!error && screenshot.url){
-              console.log('[%s] Screenshot: %s', worker.string, screenshot.url);           
+            console.log('[%s] Screenshot: %s', worker.string, screenshot.url);
           }
 
-        bsClient.terminateWorker(worker.id, function () {
-          if (!workers[uuid]) {
-            return;
-          }
+          bsClient.terminateWorker(worker.id, function () {
+            if (!workers[uuid]) {
+              return;
+            }
 
-          console.log('[%s] Terminated', worker.string);
+            console.log('[%s] Terminated', worker.string);
 
-          clearTimeout(workers[uuid].activityTimeout);
-          delete workers[uuid];
+            clearTimeout(workers[uuid].activityTimeout);
+            delete workers[uuid];
 
-          if (utils.objectSize(workers) === 0) {
-            console.log("All tests done, failures: %d.", status);
+            if (utils.objectSize(workers) === 0) {
+              console.log("All tests done, failures: %d.", status);
 
-            if (status > 0) {
-              status = 1;
-            }
+              if (status > 0) {
+                status = 1;
+              }
 
-            process.exit(status);
-          }
+              process.exit(status);
+            }
+          });
         });
-      });
       }
 
       response.end();