wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1155260: Fix base URL override in Marionette runner

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

r=davehunt
This commit is contained in:
Andreas Tolfsen 2015-04-20 11:22:00 +01:00
parent 11bd25485e
commit 7a653b24be
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testing/marionette/client/marionette/runner/base.py
View File

@ -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)

2
testing/marionette/client/setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = '0.10'
version = '0.11'
# dependencies
with open('requirements.txt') as f: