If device does not come back after provisioning, add to bad devices.

BUG=391071

Review URL: https://codereview.chromium.org/442173002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287910 0039d316-1c4b-4281-b951-d872f2087c98

build/android/provision_devices.py

@@ -21,6 +21,7 @@ import time
 from pylib import android_commands
 from pylib import constants
 from pylib import device_settings
+from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 
@@ -154,26 +155,12 @@ def WipeDevicesIfPossible(devices):
       device.WaitUntilFullyBooted(timeout=90)
 
 
-def ProvisionDevices(options):
-  is_perf = 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower()
-  # TODO(jbudorick): Parallelize provisioning of all attached devices after
-  # switching from AndroidCommands.
-  if options.device is not None:
-    devices = [options.device]
-  else:
-    devices = android_commands.GetAttachedDevices()
-
-  # Wipe devices (unless --skip-wipe was specified)
-  if not options.skip_wipe:
-    WipeDevicesIfPossible(devices)
-
-  # Provision devices
-  for device_serial in devices:
+def ProvisionDevice(device_serial, is_perf, disable_location):
   device = device_utils.DeviceUtils(device_serial)
   device.old_interface.EnableAdbRoot()
   _ConfigureLocalProperties(device, is_perf)
   device_settings_map = device_settings.DETERMINISTIC_DEVICE_SETTINGS
-    if options.disable_location:
+  if disable_location:
     device_settings_map.update(device_settings.DISABLE_LOCATION_SETTING)
   else:
     device_settings_map.update(device_settings.ENABLE_LOCATION_SETTING)
@@ -206,16 +193,63 @@ def ProvisionDevices(options):
       time.sleep(60)
       battery_info = device.old_interface.GetBatteryInfo()
   device.RunShellCommand('date -u %f' % time.time(), as_root=True)
+
+
+def ProvisionDevices(options):
+  is_perf = 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower()
+  # TODO(jbudorick): Parallelize provisioning of all attached devices after
+  # switching from AndroidCommands.
+  if options.device is not None:
+    devices = [options.device]
+  else:
+    devices = android_commands.GetAttachedDevices()
+
+  # Wipe devices (unless --skip-wipe was specified)
+  if not options.skip_wipe:
+    WipeDevicesIfPossible(devices)
+
+  bad_devices = []
+  # Provision devices
+  for device_serial in devices:
+    try:
+      ProvisionDevice(device_serial, is_perf, options.disable_location)
+    except errors.WaitForResponseTimedOutError:
+      logging.info('Timed out waiting for device %s. Adding to blacklist.',
+                   device_serial)
+      bad_devices.append(device_serial)
+      # Device black list is reset by bb_device_status_check.py per build.
+      device_blacklist.ExtendBlacklist([device_serial])
+  devices = [device for device in devices if device not in bad_devices]
+
+  # If there are no good devices
+  if not devices:
+    raise device_errors.NoDevicesError
+
   try:
     device_utils.DeviceUtils.parallel(devices).Reboot(True)
   except errors.DeviceUnresponsiveError:
     pass
+
+  bad_devices = []
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
+    try:
       device.WaitUntilFullyBooted(timeout=90)
-    (_, props) = device.old_interface.GetShellCommandStatusAndOutput('getprop')
-    for prop in props:
-      print prop
+      (_, prop) = device.old_interface.GetShellCommandStatusAndOutput('getprop')
+      for p in prop:
+        print p
+    except errors.WaitForResponseTimedOutError:
+      logging.info('Timed out waiting for device %s. Adding to blacklist.',
+                   device_serial)
+      bad_devices.append(device_serial)
+      # Device black list is reset by bb_device_status_check.py per build.
+      device_blacklist.ExtendBlacklist([device_serial])
+  devices = [device for device in devices if device not in bad_devices]
+
+  # If there are no good devices
+  if not devices:
+    raise device_errors.NoDevicesError
+
   if options.auto_reconnect:
     PushAndLaunchAdbReboot(devices, options.target)