Bug 1155260: Fix base URL override in Marionette runner

Fixes regression from bug 941085, and bumps marionette_client to 0.11.

r=davehunt

--HG--
extra : rebase_source : a38ef00252e3ef08d5b9422946779e182a69a2ac

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)

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: