fixing "proxy server not being passed to browsers capability" issue

YahooArchive · Nov 17, 2012 · 98d5d5c · 98d5d5c
1 parent 04fd928
commit 98d5d5c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -168,6 +168,7 @@ if (!argv.config) {
 
 }
 
+
 //setup config
 prop = new Properties(__dirname + "/config/config.js", argv.config, argv);
 config = prop.getAll();
@@ -219,7 +220,11 @@ if(argv.startProxyServer && !argv.arrowChildProcess ) {
     }
     global.proxyManager.runRouterProxy(config.minPort, config.maxPort, global.hostname, runArrowTest);
 } else {
-    runArrowTest();
+    if (argv.proxyHost) {
+        runArrowTest(argv.proxyHost);
+    } else {
+        runArrowTest();
+    }
 }
 
 

diff --git a/lib/session/sessionfactory.js b/lib/session/sessionfactory.js
@@ -368,17 +368,14 @@ SessionFactory.prototype.tearDown = function (testQueue, wdSessions) {
             obj.reportFile = reportFile;
         }
 
-        if (this.config.proxyUrl) {
-            this.logger.debug("Closing Proxy Server : " + this.config.proxyUrl);
-            global.proxyManager.proxyServer.close();
-        }
         process.send(obj);
 
     } else {
         if (global.workingDirectory) {
             process.chdir(global.workingDirectory);
         }
         if (this.config.proxyUrl) {
+            this.logger.debug("closing proxy server");
             global.proxyManager.proxyServer.close();
         }
 

diff --git a/lib/util/arrowrecursive.js b/lib/util/arrowrecursive.js
@@ -23,14 +23,16 @@ function ArrowRecursive(config, args) {
     this.arrDescriptor = [];
     this.currentDir = process.cwd();
     this.recArgs = clone(this.args.argv.original);
-
     if (this.args.dimensions) {
         for (var k in this.recArgs) {
             if (this.recArgs[k].indexOf("dimensions") != -1) {
                 this.recArgs[k] = "--dimensions=" + path.resolve(global.workingDirectory,this.args.dimensions);
             }
         }
     }
+    if (this.config.proxyUrl) {
+        this.recArgs.push("--proxyHost=" + this.config.proxyUrl);
+    }
 
     this.descriptorExecutionCount = 0;
     this.descriptorTotalCount = 0;
@@ -197,6 +199,11 @@ ArrowRecursive.prototype.showRecursiveReport = function (currentCount) {
 ArrowRecursive.prototype.tearDown = function() {
     var i;
 
+    if(this.config.proxyUrl) {
+        this.logger.debug("closing proxy");
+        global.proxyManager.proxyServer.close();
+    }
+
     if (this.config.coverage) {
         //console.log(global.coverageMap);
         coverage.writeReportsFor(global.coverageMap, "coverage");

diff --git a/lib/util/arrowsetup.js b/lib/util/arrowsetup.js
@@ -49,6 +49,11 @@ ArrowSetup.prototype.setupMisc = function () {
     if (this.argv.coverage !== undefined) {
         this.config.coverage = this.argv.coverage;
     }
+
+    if (this.argv.dimensions) {
+        this.argv.dimensions = path.resolve(global.workingDirectory,this.argv.dimensions);
+        this.config.dimensions = this.argv.dimensions;
+    }
 };
 
 ArrowSetup.prototype.setuplog4js = function () {
@@ -143,6 +148,7 @@ ArrowSetup.prototype.setupHeadlessParam = function () {
             if (dirName.length > 0) {
                 this.logger.info("Switching directory to: " + dirName);
                 process.chdir(dirName);
+
                 this.argv.descriptor = path.basename(results[0]);
             }
         }