Commit c0833962 authored by Chris Mumford's avatar Chris Mumford Committed by Commit Bot

Passing Android device serial to chromedriver.

The Android device serial number, specified by the --device-serial
command-line option, was never passed to the chromedriver server.
This resulted in chromedriver always using the first device or
emulator.

Bug: None
Change-Id: I1a4cb1c45739f24da5ea0f6cfb3726c84ff68fa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848264
Commit-Queue: Chris Mumford <cmumford@google.com>
Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704795}
parent f19ac06c
...@@ -54,6 +54,8 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data, ...@@ -54,6 +54,8 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
capabilities["goog:chromeOptions"]["androidPackage"] = \ capabilities["goog:chromeOptions"]["androidPackage"] = \
"org.chromium.webview_shell" "org.chromium.webview_shell"
capabilities["goog:chromeOptions"]["androidActivity"] = ".WebPlatformTestsActivity" capabilities["goog:chromeOptions"]["androidActivity"] = ".WebPlatformTestsActivity"
if 'device_serial' in kwargs:
capabilities["goog:chromeOptions"]["androidDeviceSerial"] = kwargs['device_serial']
# Workaround: driver.quit() cannot quit SystemWebViewShell. # Workaround: driver.quit() cannot quit SystemWebViewShell.
executor_kwargs["pause_after_test"] = False executor_kwargs["pause_after_test"] = False
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment