Import wpt@a88ee159339eba935a72b69e37fe54b6d6cf7ce3
Using wpt-import in Chromium ac2bbb39334b6e60537285830e9c6b036df0d543.
With Chromium commits locally applied on WPT:
bc7ec54895 "MSE: Test addSourceBuffer and changeType relaxed type strictness and allowance for implicit changeType"
250461b340 "Worker: Register a service worker just once for worker subresource interception tests"
1e9c7b68de "[Client hints] Enable ACHL persistence in content shell, refactor tests"
9c7e72528f "Add slotting for toast action buttons, alongside test scaffolding for future action testing."
2d2a3ba4ba "Cross-scheme initiator should result in `Sec-Fetch-Site: cross-site`."
7a754c3195 "Have containValues check array lengths"
5f0e92207c "KV Storage: tweak secure context restriction and expand tests"
ee7626e705 "Fixing tranferFromimageBitmap-toBlob-offscreen.html to not be flaky"
3c7f7e7b26 "[Navigation timing] Add secure connection start reuse test"
Note to sheriffs: This CL imports external tests and adds
expectations for those tests; if this CL is large and causes
a few new failures, please fix the failures by adding new
lines to TestExpectations rather than reverting. See:
https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md
Directory owners for changes in this CL:
foolip@chromium.org, lpz@chromium.org, robertma@chromium.org:
external/wpt/tools
NOAUTOREVERT=true
TBR=robertma
No-Export: true
Change-Id: Ia06ab4d96cbcc846ee403617ddd1c2f64ba3ef3e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1704284
Reviewed-by: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: WPT Autoroller <wpt-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#677887}
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
index fb39edd..78b77ff2 100644
--- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
+++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_6.json
@@ -476677,7 +476677,7 @@
"support"
],
"tools/wptrunner/wptrunner/browsers/chrome_android.py": [
- "3c277a567d7f06f39dfc02cb18d5229c7570a131",
+ "31ae7995b4010a6fcef0c585eed1128815837fcb",
"support"
],
"tools/wptrunner/wptrunner/browsers/edge.py": [
diff --git a/third_party/blink/web_tests/external/wpt/tools/wptrunner/wptrunner/browsers/chrome_android.py b/third_party/blink/web_tests/external/wpt/tools/wptrunner/wptrunner/browsers/chrome_android.py
index 3c277a5..31ae799 100644
--- a/third_party/blink/web_tests/external/wpt/tools/wptrunner/wptrunner/browsers/chrome_android.py
+++ b/third_party/blink/web_tests/external/wpt/tools/wptrunner/wptrunner/browsers/chrome_android.py
@@ -48,18 +48,18 @@
**kwargs)
executor_kwargs["close_after_done"] = True
capabilities = dict(DesiredCapabilities.CHROME.items())
- capabilities["chromeOptions"] = {}
- # required to start on mobile
- capabilities["chromeOptions"]["androidPackage"] = "com.google.android.apps.chrome"
+ capabilities["goog:chromeOptions"] = {}
+ # TODO(chrome): browser_channel should be properly supported.
+ package_name = "com.android.chrome" # stable channel
+ # Required to start on mobile
+ capabilities["goog:chromeOptions"]["androidPackage"] = package_name
for (kwarg, capability) in [("binary", "binary"), ("binary_args", "args")]:
if kwargs[kwarg] is not None:
- capabilities["chromeOptions"][capability] = kwargs[kwarg]
+ capabilities["goog:chromeOptions"][capability] = kwargs[kwarg]
if test_type == "testharness":
capabilities["useAutomationExtension"] = False
capabilities["excludeSwitches"] = ["enable-automation"]
- if test_type == "wdspec":
- capabilities["chromeOptions"]["w3c"] = True
executor_kwargs["capabilities"] = capabilities
return executor_kwargs
@@ -86,15 +86,17 @@
self.server = ChromeDriverServer(self.logger,
binary=webdriver_binary,
args=webdriver_args)
+ self.setup_adb_reverse()
def _adb_run(self, args):
self.logger.info('adb ' + ' '.join(args))
subprocess.check_call(['adb'] + args)
- def setup(self):
+ def setup_adb_reverse(self):
self._adb_run(['wait-for-device'])
self._adb_run(['forward', '--remove-all'])
self._adb_run(['reverse', '--remove-all'])
+ # "adb reverse" forwards network connection from device to host.
for port in _wptserve_ports:
self._adb_run(['reverse', 'tcp:%d' % port, 'tcp:%d' % port])
