From 7a653b24be169d8fe2973c4a6e69d6d99848ac9a Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Mon, 20 Apr 2015 11:22:00 +0100 Subject: [PATCH] Bug 1155260: Fix base URL override in Marionette runner Fixes regression from bug 941085, and bumps marionette_client to 0.11. r=davehunt --- testing/marionette/client/marionette/runner/base.py | 13 +++++++++---- testing/marionette/client/setup.py | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/testing/marionette/client/marionette/runner/base.py b/testing/marionette/client/marionette/runner/base.py index 55c2ea6fef3..787858f297c 100644 --- a/testing/marionette/client/marionette/runner/base.py +++ b/testing/marionette/client/marionette/runner/base.py @@ -762,11 +762,16 @@ setReq.onerror = function() { if self._capabilities['device'] == "desktop": need_external_ip = False + # Gaia sets server_root and that means we shouldn't spin up our own httpd if not self.httpd: - self.logger.info("starting httpd") - self.start_httpd(need_external_ip) - self.marionette.baseurl = self.httpd.get_url() - self.logger.info("running httpd on %s" % self.marionette.baseurl) + if self.server_root is None or os.path.isdir(self.server_root): + self.logger.info("starting httpd") + self.start_httpd(need_external_ip) + self.marionette.baseurl = self.httpd.get_url() + self.logger.info("running httpd on %s" % self.marionette.baseurl) + else: + self.marionette.baseurl = self.server_root + self.logger.info("using remote content from %s" % self.marionette.baseurl) for test in tests: self.add_test(test) diff --git a/testing/marionette/client/setup.py b/testing/marionette/client/setup.py index 324a53d348a..79883fb71e2 100644 --- a/testing/marionette/client/setup.py +++ b/testing/marionette/client/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = '0.10' +version = '0.11' # dependencies with open('requirements.txt') as f: