From 2b5bba6f12481acf315b6c55f3ac129dce373bd6 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 20 Jul 2018 18:13:59 +0200 Subject: [PATCH] =?UTF-8?q?servodriver:=20increase=20browser=E2=80=99s=20i?= =?UTF-8?q?nit=5Ftimeout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/wptrunner/wptrunner/browsers/servodriver.py | 4 +++- .../wptrunner/wptrunner/executors/executorservodriver.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py index fe392e06651..4111d8b48a8 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py @@ -73,6 +73,7 @@ def write_hosts_file(config): class ServoWebDriverBrowser(Browser): 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", server_config=None, binary_args=None, user_stylesheets=None): @@ -166,4 +167,5 @@ class ServoWebDriverBrowser(Browser): def executor_browser(self): assert self.webdriver_port is not None return ExecutorBrowser, {"webdriver_host": self.webdriver_host, - "webdriver_port": self.webdriver_port} + "webdriver_port": self.webdriver_port, + "init_timeout": self.init_timeout} diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py index 47f3c39499a..896aeb39eff 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorservodriver.py @@ -88,12 +88,12 @@ class ServoWebDriverProtocol(Protocol): self.capabilities = capabilities self.host = browser.webdriver_host self.port = browser.webdriver_port + self.init_timeout = browser.init_timeout self.session = None def connect(self): """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=300) + wait_for_service((self.host, self.port), timeout=self.init_timeout) self.session = webdriver.Session(self.host, self.port, extension=ServoCommandExtensions) self.session.start()