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

Update web-platform-tests to revision 68a256f49be380ca4add535ce8ece9de28820e6b

Browse source
This commit is contained in:
WPT Sync Bot 2018-02-04 20:08:48 -05:00
parent e54935c25a
commit cd5bf022bd
178 changed files with 6082 additions and 795 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
View file

@ -1,3 +1,6 @@
import subprocess
from ..config import *
from .base import Browser, ExecutorBrowser, require_arg
from ..webdriver_server import ChromeDriverServer
from ..executors import executor_kwargs as base_executor_kwargs
@ -17,6 +20,8 @@ __wptrunner__ = {"product": "chrome_android",
"env_extras": "env_extras",
"env_options": "env_options"}
_wptserve_ports = set()
def check_args(**kwargs):
require_arg(kwargs, "webdriver_binary")
@ -32,13 +37,19 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
**kwargs):
from selenium.webdriver import DesiredCapabilities
# Use extend() to modify the global list in place.
_wptserve_ports.update(set(
server_config['ports']['http'] + server_config['ports']['https'] +
server_config['ports']['ws'] + server_config['ports']['wss']
))
executor_kwargs = base_executor_kwargs(test_type, server_config,
cache_manager, **kwargs)
executor_kwargs["close_after_done"] = True
capabilities = dict(DesiredCapabilities.CHROME.items())
capabilities["chromeOptions"] = {}
# required to start on mobile
capabilities["chromeOptions"]["androidPackage"] = "com.android.chrome"
capabilities["chromeOptions"]["androidPackage"] = "com.google.android.apps.chrome"
for (kwarg, capability) in [("binary", "binary"), ("binary_args", "args")]:
if kwargs[kwarg] is not None:
@ -76,6 +87,17 @@ class ChromeAndroidBrowser(Browser):
binary=webdriver_binary,
args=webdriver_args)
def _adb_run(self, args):
self.logger.info('adb ' + ' '.join(args))
subprocess.check_call(['adb'] + args)
def setup(self):
self._adb_run(['wait-for-device'])
self._adb_run(['forward', '--remove-all'])
self._adb_run(['reverse', '--remove-all'])
for port in _wptserve_ports:
self._adb_run(['reverse', 'tcp:%d' % port, 'tcp:%d' % port])
def start(self, **kwargs):
self.server.start(block=False)
@ -93,6 +115,8 @@ class ChromeAndroidBrowser(Browser):
def cleanup(self):
self.stop()
self._adb_run(['forward', '--remove-all'])
self._adb_run(['reverse', '--remove-all'])
def executor_browser(self):
return ExecutorBrowser, {"webdriver_url": self.server.url}

1
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
View file

@ -229,7 +229,6 @@ class BrowserManager(object):
def cleanup(self):
if self.init_timer is not None:
self.init_timer.cancel()
self.browser.cleanup()
def check_for_crashes(self):
self.browser.check_for_crashes()