Move writing adb keys into the wipe.

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 107 matching lines @@
 
 def WriteAdbKeysFile(device, adb_keys_string):
   dir_path = posixpath.dirname(constants.ADB_KEYS_FILE)
   device.RunShellCommand('mkdir -p %s' % dir_path, as_root=True)
   device.RunShellCommand('restorecon %s' % dir_path, as_root=True)
   device.WriteFile(constants.ADB_KEYS_FILE, adb_keys_string, as_root=True)
   device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                          as_root=True)
 
 
-def WipeDeviceData(device):
+def WipeDeviceData(device, options):
   """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, adb_keys file is rewritten so the device does not need to be
   re-authorized.
 
   Arguments:
     device: the device to wipe
   """
   device_authorized = device.FileExists(constants.ADB_KEYS_FILE)
   if device_authorized:
-    adb_keys = device.ReadFile(constants.ADB_KEYS_FILE, as_root=True)
+    adb_keys = device.ReadFile(constants.ADB_KEYS_FILE,
+                               as_root=True).rstrip('\n').split('\n')

[jbudorick, 2015/03/02 16:13:00]

nit: just do device.ReadFile(...).splitlines()

[navabi, 2015/03/02 16:36:43]

Done.

   device.RunShellCommand('wipe data', as_root=True)
   if device_authorized:
-    WriteAdbKeysFile(device, adb_keys)
+    adb_keys_set = set(adb_keys)
+    if options.adb_key_files:
+      for adb_key_file in options.adb_key_files:

[jbudorick, 2015/03/02 16:13:00]

nit: as luqui pointed out to me in another review, these two lines could be
condensed to

  for adb_key_file in options.adb_key_files or []:

[navabi, 2015/03/02 16:36:43]

Done.

+        with open(adb_key_file, 'r') as f:
+          adb_public_keys = f.readlines()
+        adb_keys_set.update(adb_public_keys)
+    WriteAdbKeysFile(device, '\n'.join(adb_keys_set))
 
 
-def WipeDeviceIfPossible(device, timeout):
+def WipeDeviceIfPossible(device, timeout, options):
   try:
     device.EnableRoot()
-    WipeDeviceData(device)
+    WipeDeviceData(device, options)
     device.Reboot(True, timeout=timeout, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
 
 def ChargeDeviceToLevel(device, level):
   def device_charged():
     battery_level = device.GetBatteryInfo().get('level')
     if battery_level is None:
       logging.warning('Unable to find current battery level.')
       battery_level = 100
     else:
       logging.info('current battery level: %d', battery_level)
       battery_level = int(battery_level)
     return battery_level >= level
 
   timeout_retry.WaitFor(device_charged, wait_period=60)
 
 
 def ProvisionDevice(device, options):
   if options.reboot_timeout:
     reboot_timeout = options.reboot_timeout
   elif (device.build_version_sdk >=
         constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
     reboot_timeout = _DEFAULT_TIMEOUTS.LOLLIPOP
   else:
     reboot_timeout = _DEFAULT_TIMEOUTS.PRE_LOLLIPOP
 
-  if options.adb_key_files:
-    adb_keys = set()
-    for adb_key_file in options.adb_key_files:
-      with open(adb_key_file, 'r') as f:
-        adb_public_keys = f.readlines()
-      adb_keys.update(adb_public_keys)
-    WriteAdbKeysFile(device, '\n'.join(adb_keys))
-
   try:
     if not options.skip_wipe:
-      WipeDeviceIfPossible(device, reboot_timeout)
+      WipeDeviceIfPossible(device, reboot_timeout, options)
     try:
       device.EnableRoot()
     except device_errors.CommandFailedError as e:
       logging.warning(str(e))
     _ConfigureLocalProperties(device, options.enable_java_debug)
     device_settings.ConfigureContentSettings(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
     if options.disable_location:
       device_settings.ConfigureContentSettings(
           device, device_settings.DISABLE_LOCATION_SETTINGS)
@@ skipping 93 matching lines @@
   parser.add_argument('--adb-key-files', type=str, nargs='+',
                       help='list of adb keys to push to device')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())