Merge pull request #12 from browserstack/multiple_tunnel

Multiple tunnel

Author: nakula

bin/runner.js

@@ -87,6 +87,10 @@ function launchBrowser(browser) {
     browser.build = config.build;
   }
 
+  if(config.tunnelIdentifier) {
+    browser["tunnel_identifier"] = config.tunnelIdentifier;
+  }
+
   client.createWorker(browser, function (err, worker) {
     if (err || typeof worker !== 'object') {
       utils.alertBrowserStack("Failed to launch worker",
@@ -135,7 +139,7 @@ function launchBrowser(browser) {
 }
 
 if (config.browsers && config.browsers.length > 0) {
-  tunnel = new Tunnel(config.key, serverPort, function () {
+  tunnel = new Tunnel(config.key, serverPort, config.tunnelIdentifier, function () {
     config.browsers.forEach(function(browser) {
       if (browser.browser_version === "latest") {
         console.log("[%s] Finding version.", utils.browserString(browser));

lib/config.js

@@ -61,6 +61,8 @@ if (!fs.existsSync(config.test_path)){
   process.exit(1);
 }
 
+config.tunnelIdentifier = process.env.TUNNEL_ID || process.env.TRAVIS_BUILD_ID;
+
 for (key in config) {
   if (config.hasOwnProperty(key)) {
     exports[key] = config[key];

lib/tunnel.js

@@ -4,7 +4,7 @@ var exec = require('child_process').exec,
     tunnelJar = '/tmp/BrowserStackTunnel.jar',
     utils = require('./utils');
 
-var Tunnel = function Tunnel (key, port, callback, err) {
+var Tunnel = function Tunnel (key, port, tunnelIdentifier, callback, err) {
   var that = {};
 
   function tunnelLauncher () {
@@ -13,7 +13,7 @@ var Tunnel = function Tunnel (key, port, callback, err) {
     tunnelCommand += 'localhost' + ',';
     tunnelCommand += port.toString() + ',';
     tunnelCommand += '0';
-    tunnelCommand += ' -force -onlyAutomate';
+    tunnelCommand += (typeof tunnelIdentifier === 'undefined')? ' -force -onlyAutomate' : ' -tunnelIdentifier ' + tunnelIdentifier;
 
     if (typeof callback !== 'function') {
       callback = function () {};

package.json

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