Provision devices: use ReadFile/WriteFile to load/restore adb keys

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 101 matching lines @@
   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.RunShellCommand('cat %s' % constants.ADB_KEYS_FILE,
-                                      as_root=True)
+    adb_keys = device.ReadFile(constants.ADB_KEYS_FILE, as_root=True)

[jbudorick, 2014/12/15 23:13:42]

These will both now check a return value where they weren't before. I think
that's ok -- we want to fail loudly if we fail either of these -- but, as with
the ReadFile CL, you might hit some turbulence.

   device.RunShellCommand('wipe data', as_root=True)
   if device_authorized:
     path_list = constants.ADB_KEYS_FILE.split('/')
     dir_path = '/'.join(path_list[:len(path_list)-1])
     device.RunShellCommand('mkdir -p %s' % dir_path, as_root=True)
     device.RunShellCommand('restorecon %s' % dir_path, as_root=True)
-    device.RunShellCommand('echo %s > %s' %
-                           (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.WriteFile(constants.ADB_KEYS_FILE, adb_keys, as_root=True)
     device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                            as_root=True)
 
 
 def WipeDeviceIfPossible(device):
   try:
     device.EnableRoot()
     WipeDeviceData(device)
     # TODO(jbudorick): Tune the timeout per OS version.
     device.Reboot(True, timeout=600, retries=0)
@@ skipping 110 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   return ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))