Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

servodriver: increase browser’s init_timeout

Browse source
This commit is contained in:
Simon Sapin 2018-07-20 18:13:59 +02:00
parent 45b710b7f0
commit 2b5bba6f12
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
View file

@ -73,6 +73,7 @@ def write_hosts_file(config):
class ServoWebDriverBrowser(Browser): class ServoWebDriverBrowser(Browser):
used_ports = set() used_ports = set()
init_timeout = 300 # Large timeout for cases where we're booting an Android emulator
def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1", def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1",
server_config=None, binary_args=None, user_stylesheets=None): server_config=None, binary_args=None, user_stylesheets=None):
@ -166,4 +167,5 @@ class ServoWebDriverBrowser(Browser):
def executor_browser(self): def executor_browser(self):
assert self.webdriver_port is not None assert self.webdriver_port is not None
return ExecutorBrowser, {"webdriver_host": self.webdriver_host, return ExecutorBrowser, {"webdriver_host": self.webdriver_host,
"webdriver_port": self.webdriver_port} "webdriver_port": self.webdriver_port,
"init_timeout": self.init_timeout}

4
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py
View file

@ -88,12 +88,12 @@ class ServoWebDriverProtocol(Protocol):
self.capabilities = capabilities self.capabilities = capabilities
self.host = browser.webdriver_host self.host = browser.webdriver_host
self.port = browser.webdriver_port self.port = browser.webdriver_port
self.init_timeout = browser.init_timeout
self.session = None self.session = None
def connect(self): def connect(self):
"""Connect to browser via WebDriver.""" """Connect to browser via WebDriver."""
# Large timeout for the case where we're booting an Android emulator. wait_for_service((self.host, self.port), timeout=self.init_timeout)
wait_for_service((self.host, self.port), timeout=300)
self.session = webdriver.Session(self.host, self.port, extension=ServoCommandExtensions) self.session = webdriver.Session(self.host, self.port, extension=ServoCommandExtensions)
self.session.start() self.session.start()