🐠 Use the new DeviceUtils.HealthyDevices(device_arg=) in a few scripts

build/android/adb_install_apk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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.
 
 """Utility script to install APKs from the command line quickly."""
 
 import argparse
 import glob
@@ skipping 36 matching lines @@
   parser.add_argument('--debug', action='store_const', const='Debug',
                       dest='build_type',
                       default=os.environ.get('BUILDTYPE', 'Debug'),
                       help='If set, run test suites under out/Debug. '
                            'Default is env var BUILDTYPE or Debug')
   parser.add_argument('--release', action='store_const', const='Release',
                       dest='build_type',
                       help='If set, run test suites under out/Release. '
                            'Default is env var BUILDTYPE or Debug.')
   parser.add_argument('-d', '--device', dest='devices', action='append',
+                      default=[],
                       help='Target device for apk to install on. Enter multiple'
                            ' times for multiple devices.')
   parser.add_argument('--adb-path',
                       help='Absolute path to the adb binary to use.')
   parser.add_argument('--blacklist-file', help='Device blacklist JSON file.')
   parser.add_argument('-v', '--verbose', action='count',
                       help='Enable verbose logging.')
   parser.add_argument('--downgrade', action='store_true',
                       help='If set, allows downgrading of apk.')
   parser.add_argument('--timeout', type=int,
@@ skipping 35 matching lines @@
         logging.warning('No apks matched for %s.', split_glob)
       for f in apks:
         helper = apk_helper.ApkHelper(f)
         if (helper.GetPackageName() == base_apk_package
             and helper.GetSplitName()):
           splits.append(f)
 
   blacklist = (device_blacklist.Blacklist(args.blacklist_file)
                if args.blacklist_file
                else None)
-  devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
-
-  if args.devices:
-    devices = [d for d in devices if d in args.devices]
-    if not devices:
-      raise device_errors.DeviceUnreachableError(args.devices)
-  elif not devices:
-    raise device_errors.NoDevicesError()
+  devices = device_utils.DeviceUtils.HealthyDevices(blacklist=blacklist,
+                                                    device_arg=args.devices)
 
   def blacklisting_install(device):
     try:
       if args.splits:
         device.InstallSplitApk(apk, splits, reinstall=args.keep_data,
                                allow_downgrade=args.downgrade)
       else:
         device.Install(apk, reinstall=args.keep_data,
                        allow_downgrade=args.downgrade,
                        timeout=args.timeout)
     except device_errors.CommandFailedError:
       logging.exception('Failed to install %s', args.apk_name)
       if blacklist:
         blacklist.Extend([str(device)], reason='install_failure')
         logging.warning('Blacklisting %s', str(device))
     except device_errors.CommandTimeoutError:
       logging.exception('Timed out while installing %s', args.apk_name)
       if blacklist:
         blacklist.Extend([str(device)], reason='install_timeout')
         logging.warning('Blacklisting %s', str(device))
 
   device_utils.DeviceUtils.parallel(devices).pMap(blacklisting_install)
 
 
 if __name__ == '__main__':
   sys.exit(main())