Android bot changes for robustness, profiling, and debugging.

build/android/android_commands.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 
 Usage:
@@ skipping 405 matching lines @@
 
     # They don't match, so remove everything first and then create it.
     if os.path.isdir(local_path):
       self.RunShellCommand('rm -r %s' % device_path, timeout_time=2*60)
       self.RunShellCommand('mkdir -p %s' % device_path)
 
     # NOTE: We can't use adb_interface.Push() because it hardcodes a timeout of
     # 60 seconds which isn't sufficient for a lot of users of this method.
     push_command = 'push %s %s' % (local_path, device_path)
     logging.info('>>> $' + push_command)
-    self._adb.SendCommand(push_command, timeout_time=30*60)
+    output = self._adb.SendCommand(push_command, timeout_time=30*60)
+    # Success looks like this: "3035 KB/s (12512056 bytes in 4.025s)"
+    # Errors look like this: "failed to copy  ... "
+    if not re.search('^[0-9]', output):
+      logging.critical('PUSH FAILED: ' + output)
 
   def GetFileContents(self, filename):
     """Gets contents from the file specified by |filename|."""
     return self.RunShellCommand('if [ -f "' + filename + '" ]; then cat "' +
                                 filename + '"; fi')
 
   def SetFileContents(self, filename, contents):
     """Writes |contents| to the file specified by |filename|."""
     with tempfile.NamedTemporaryFile() as f:
       f.write(contents)
@@ skipping 330 matching lines @@
   options, args = option_parser.parse_args(argv)
 
   commands = AndroidCommands(wait_for_pm=options.wait_for_pm)
   if options.set_asserts != None:
     if commands.SetJavaAssertsEnabled(options.set_asserts):
       commands.Reboot(full_reboot=False)
 
 
 if __name__ == '__main__':
   main(sys.argv)