diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-05 23:05:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 23:05:44 +0000 |
| commit | 548f841b745404224698a3eafc6d4cb190d0ca8c (patch) | |
| tree | 8a0d6fd78eb610653f12ded770595c80f1e89a61 /catapult/devil/devil/android/tools/wait_for_devices.py | |
| parent | 1d3aa42aef5ab74bf9b13fb5a7e18c73e137f58c (diff) | |
| parent | a5e4f4d2969520f4563ec0d66cbe469c49ee38bc (diff) | |
| download | chromium-trace-548f841b745404224698a3eafc6d4cb190d0ca8c.tar.gz | |
Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607 am: 316160b179 am: 3fd616f492 am: 5338649baa am: a5e4f4d296
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1392438
Change-Id: I7a428aa7cb0cdad8a449e25867e8c4bb514c2d2d
Diffstat (limited to 'catapult/devil/devil/android/tools/wait_for_devices.py')
| -rwxr-xr-x | catapult/devil/devil/android/tools/wait_for_devices.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/catapult/devil/devil/android/tools/wait_for_devices.py b/catapult/devil/devil/android/tools/wait_for_devices.py index bc733355..062f788f 100755 --- a/catapult/devil/devil/android/tools/wait_for_devices.py +++ b/catapult/devil/devil/android/tools/wait_for_devices.py @@ -2,7 +2,6 @@ # Copyright 2016 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - """Waits for the given devices to be available.""" import argparse @@ -11,8 +10,8 @@ import sys if __name__ == '__main__': sys.path.append( - os.path.abspath(os.path.join(os.path.dirname(__file__), - '..', '..', '..'))) + os.path.abspath( + os.path.join(os.path.dirname(__file__), '..', '..', '..'))) from devil.android import device_utils from devil.android.tools import script_common @@ -22,11 +21,18 @@ from devil.utils import run_tests_helper def main(raw_args): parser = argparse.ArgumentParser() parser.add_argument('-v', '--verbose', action='count', help='Log more.') - parser.add_argument('-t', '--timeout', default=30, type=int, - help='Seconds to wait for the devices.') + parser.add_argument( + '-t', + '--timeout', + default=30, + type=int, + help='Seconds to wait for the devices.') parser.add_argument('--adb-path', help='ADB binary to use.') - parser.add_argument('device_serials', nargs='*', metavar='SERIAL', - help='Serials of the devices to wait for.') + parser.add_argument( + 'device_serials', + nargs='*', + metavar='SERIAL', + help='Serials of the devices to wait for.') args = parser.parse_args(raw_args) |