Add option to wipe device.

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>]
 """
 
 import logging
 import optparse
 import os
 import re
 import subprocess
 import sys
 import time
 
 from pylib import android_commands
 from pylib import constants
 from pylib import device_settings
-from pylib.cmd_helper import GetCmdOutput
 from pylib.device import device_utils
 
 def KillHostHeartbeat():
   ps = subprocess.Popen(['ps', 'aux'], stdout = subprocess.PIPE)
   stdout, _ = ps.communicate()
   matches = re.findall('\\n.*host_heartbeat.*', stdout)
   for match in matches:
     print 'An instance of host heart beart running... will kill'
     pid = re.findall('(\d+)', match)[1]
     subprocess.call(['kill', str(pid)])
@@ skipping 47 matching lines @@
   device.old_interface.SetProtectedFileContents(
       constants.DEVICE_LOCAL_PROPERTIES_PATH,
       '\n'.join(local_props))
   # Android will not respect the local props file if it is world writable.
   device.old_interface.RunShellCommandWithSU(
       'chmod 644 %s' % constants.DEVICE_LOCAL_PROPERTIES_PATH)
 
   # LOCAL_PROPERTIES_PATH = '/data/local.prop'
 
 
-def WipeDeviceData(device):
+def WipeDeviceData(device, reboot=True):

[Dan Jacques, 2014/04/26 01:11:26]

Is this ever called with 'reboot=True'? If not, I suggest you remove 'reboot'
functionality from this function altogether and let its caller decide to reboot
after a wipe independently.

[navabi, 2014/04/26 01:15:36]

Done.

   """Wipes data from device, keeping only the adb_keys for authorization.
 
   After wiping data on a device that has been authorized, adb can still
   communicate with the device, but after reboot the device will need to be
   re-authorized because the adb keys file is stored in /data/misc/adb/.
   Thus, before reboot the adb_keys file is rewritten so the device does not need
   to be re-authorized.
 
   Arguments:
     device: the device to wipe
   """
   device_authorized = device.old_interface.FileExistsOnDevice(
       constants.ADB_KEYS_FILE)
   if device_authorized:
     adb_keys = device.old_interface.RunShellCommandWithSU(
-      'cat %s' % constants.ADB_KEYS_FILE)[0]
+      'cat %s' % constants.ADB_KEYS_FILE)
   device.old_interface.RunShellCommandWithSU('wipe data')
   if device_authorized:
     path_list = constants.ADB_KEYS_FILE.split('/')
     dir_path = '/'.join(path_list[:len(path_list)-1])
     device.old_interface.RunShellCommandWithSU('mkdir -p %s' % dir_path)
-    adb_keys = device.old_interface.RunShellCommand(
-      'echo %s > %s' % (adb_keys, constants.ADB_KEYS_FILE))
-  device.old_interface.Reboot()
+    device.old_interface.RunShellCommandWithSU('touch %s' %
+                                               constants.ADB_KEYS_FILE)
+    for adb_key in adb_keys:
+      device.old_interface.RunShellCommand(
+        'echo %s >> %s' % (adb_key, constants.ADB_KEYS_FILE))
+  if reboot:
+    device.old_interface.Reboot()
 
 
 def ProvisionDevices(options):
   if options.device is not None:
     devices = [options.device]
   else:
     devices = android_commands.GetAttachedDevices()
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
-    install_output = GetCmdOutput(
-      ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT,
-       '--apk',
-       '%s/build/android/CheckInstallApk-debug.apk' % constants.DIR_SOURCE_ROOT
-       ])
-    failure_string = 'Failure [INSTALL_FAILED_INSUFFICIENT_STORAGE]'
-    if failure_string in install_output:
-      WipeDeviceData(device)
+    # Wipe device data, but don't reboot devices (takes too long)
+    WipeDeviceData(device, reboot=False)
     _ConfigureLocalProperties(device)
     device_settings.ConfigureContentSettingsDict(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
     # TODO(tonyg): We eventually want network on. However, currently radios
     # can cause perfbots to drain faster than they charge.
     if 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower():
       device_settings.ConfigureContentSettingsDict(
           device, device_settings.NETWORK_DISABLED_SETTINGS)
     device.old_interface.RunShellCommandWithSU('date -u %f' % time.time())
   if options.auto_reconnect:
@@ skipping 15 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))