[devil refactor] Prepare clients for DeviceUnreachableError

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 119 matching lines @@
       logging.info("Version name for %s is %s", package, version_name)
 
     CheckExternalStorage(device)
 
   except device_errors.CommandTimeoutError:
     logging.exception('Timed out waiting for device %s. Adding to blacklist.',
                       str(device))
     if blacklist:
       blacklist.Extend([str(device)], reason='provision_timeout')
 
-  except device_errors.CommandFailedError:
+  except (device_errors.CommandFailedError,
+          device_errors.DeviceUnreachableError):
     logging.exception('Failed to provision device %s. Adding to blacklist.',
                       str(device))
     if blacklist:
       blacklist.Extend([str(device)], reason='provision_failure')
 
 def CheckExternalStorage(device):
   """Checks that storage is writable and if not makes it writable.
 
   Arguments:
     device: The device to check.
@@ skipping 400 matching lines @@
 
   try:
     return ProvisionDevices(args)
   except (device_errors.DeviceUnreachableError, device_errors.NoDevicesError):
     logging.exception('Unable to provision local devices.')
     return exit_codes.INFRA
 
 
 if __name__ == '__main__':
   sys.exit(main())