Merge pull request #30 from browserstack/worker_timeout

Worker timeout

Author: nakula

README.md

@@ -38,6 +38,8 @@ If nothing is provided as `preset` **default** is used.
  - *test_framework*: Specify test framework which will execute the tests.
     We support qunit, jasmine and mocha.
 
+ - *timeout*: Specify worker timeout with BrowserStack.
+
  - *browsers*: A list of browsers on which tests are to be run.
 
 A sample configuration file:

bin/runner.js

@@ -88,6 +88,13 @@ function launchBrowser(browser, url) {
     browser["tunnel_identifier"] = config.tunnelIdentifier;
   }
 
+  var timeout = parseInt(config.timeout);
+  if(! isNaN(timeout)) {
+    browser.timeout = timeout;
+  } else {
+    timeout = 300;
+  }
+
   client.createWorker(browser, function (err, worker) {
     if (err || typeof worker !== 'object') {
       console.log("Error from BrowserStack: ", err);
@@ -117,19 +124,19 @@ function launchBrowser(browser, url) {
           worker.activityTimeout = setTimeout(function () {
             if (!worker.acknowledged) {
               var subject = "Worker inactive for too long: " + worker.string;
-              var content = "Worker details:\n" + JSON.stringify(worker, null, 4);
+              var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
 
               utils.alertBrowserStack(subject, content);
             }
-          }, 60 * 1000);
+          }, timeout * 1000);
 
           setTimeout(function () {
             if (workers[key]) {
               var subject = "Tests timed out on: " + worker.string;
-              var content = "Worker details:\n" + JSON.stringify(worker, null, 4);
+              var content = "Worker details:\n" + JSON.stringify(worker.config, null, 4);
               utils.alertBrowserStack(subject, content);
             }
-          }, (config.timeout || 300) * 1000);
+          }, (timeout * 1000));
         }
       });
     }, 2000);
@@ -145,7 +152,7 @@ var launchBrowsers = function(config, browser) {
       });
     } else {
       var url = 'http://localhost:' + serverPort.toString() + '/' + config.test_path;
-      launchBrowser(browser,url);              
+      launchBrowser(browser,url);
     }
   }, 100);
 }

package.json

@@ -8,7 +8,7 @@
     "url": "git://github.com/browserstack/browserstack-runner.git"
   },
   "dependencies": {
-    "browserstack": "1.0.1"
+    "browserstack": "1.0.2"
   },
   "bin": {
     "browserstack-runner": "bin/cli.js"