[Android] Fix provisioning for perf bots on L and/or user builds.

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 120 matching lines @@
                            (adb_keys[0], constants.ADB_KEYS_FILE), as_root=True)
     for adb_key in adb_keys[1:]:
       device.RunShellCommand(
         'echo %s >> %s' % (adb_key, constants.ADB_KEYS_FILE), as_root=True)
     device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                            as_root=True)
 
 
 def WipeDeviceIfPossible(device):
   try:
     device.EnableRoot()

[jbudorick, 2014/08/21 17:15:15]

@tonyg: it'll skip the wipe here. if we can't enable root, this will raise an
exception which will then be caught on line 145

     WipeDeviceData(device)
-    device.Reboot(True, timeout=180, retries=0)
+    # TODO(jbudorick): Tune the timeout per OS version.
+    device.Reboot(True, timeout=600, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
 
 def ProvisionDevice(device, options, is_perf):
   try:
     if not options.skip_wipe:
       WipeDeviceIfPossible(device)
-    device.EnableRoot()
+    try:
+      device.EnableRoot()

[tonyg, 2014/08/21 17:12:58]

I think the old code would skip the wipe if we couldn't enable root. Because the
wipe'll break adb on user builds. Does the new code do that too? If so, lgtm

+    except device_errors.CommandFailedError as e:
+      logging.warning(str(e))
     _ConfigureLocalProperties(device, is_perf)
     device_settings.ConfigureContentSettings(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
     if options.disable_location:
       device_settings.ConfigureContentSettings(
           device, device_settings.DISABLE_LOCATION_SETTINGS)
     else:
       device_settings.ConfigureContentSettings(
           device, device_settings.ENABLE_LOCATION_SETTINGS)
     device_settings.SetLockScreenSettings(device)
@@ skipping 17 matching lines @@
           if device.old_interface.CanControlUsbCharging():
             device.old_interface.EnableUsbCharging()
           else:
             logging.error('Device is not charging')
             break
         logging.info('Waiting for device to charge. Current level=%s',
                      battery_info.get('level', 0))
         time.sleep(60)
         battery_info = device.old_interface.GetBatteryInfo()
     device.RunShellCommand('date -u %f' % time.time(), as_root=True)
-    device.Reboot(True, timeout=180, retries=0)
+    # TODO(jbudorick): Tune the timeout per OS version.
+    device.Reboot(True, timeout=600, retries=0)
     props = device.RunShellCommand('getprop')
     for prop in props:
       logging.info('  %s' % prop)
     if options.auto_reconnect:
       PushAndLaunchAdbReboot(device, options.target)
   except (errors.WaitForResponseTimedOutError,
           device_errors.CommandTimeoutError):
     logging.info('Timed out waiting for device %s. Adding to blacklist.',
                  str(device))
     # Device black list is reset by bb_device_status_check.py per build.
@@ skipping 43 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   return ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))