Organize adb install cmds and reboot on failure

third_party/android_testrunner/adb_interface.py

 #!/usr/bin/python2.4
 #
 #
 # Copyright 2008, The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
@@ skipping 33 matching lines @@
     self._target_arg = "-e"
 
   def SetDeviceTarget(self):
     """Direct all future commands to the only connected USB device."""
     self._target_arg = "-d"
 
   def SetTargetSerial(self, serial):
     """Direct all future commands to Android target with the given serial."""
     self._target_arg = "-s %s" % serial
 
-  def SendCommand(self, command_string, timeout_time=20, retry_count=3):
+  def SendCommand(self, command_string, timeout_time=20, retry_count=3,
+                  cmd_logger=None):
     """Send a command via adb.
 
     Args:
       command_string: adb command to run
       timeout_time: number of seconds to wait for command to respond before
         retrying
       retry_count: number of times to retry command before raising

[bulach, 2012/08/09 12:36:52]

new param requires docstring..

         WaitForResponseTimedOutError
     Returns:
       string output of command
 
     Raises:
       WaitForResponseTimedOutError if device does not respond to command within time
     """
     adb_cmd = "adb %s %s" % (self._target_arg, command_string)
     logger.SilentLog("about to run %s" % adb_cmd)
+    if cmd_logger:
+      cmd_logger.info('>>> $ %s' % adb_cmd)
     return run_command.RunCommand(adb_cmd, timeout_time=timeout_time,
                                   retry_count=retry_count)
 
-  def SendShellCommand(self, cmd, timeout_time=20, retry_count=3):
+  def SendShellCommand(self, cmd, timeout_time=20, retry_count=3,
+                       cmd_logger=None):
     """Send a adb shell command.
 
     Args:
       cmd: adb shell command to run
       timeout_time: number of seconds to wait for command to respond before
         retrying
       retry_count: number of times to retry command before raising
         WaitForResponseTimedOutError
 
     Returns:
       string output of command
 
     Raises:
       WaitForResponseTimedOutError: if device does not respond to command
     """
     return self.SendCommand("shell %s" % cmd, timeout_time=timeout_time,
-                            retry_count=retry_count)
+                            retry_count=retry_count, cmd_logger=cmd_logger)
 
   def BugReport(self, path):
     """Dumps adb bugreport to the file specified by the path.
 
     Args:
       path: Path of the file where adb bugreport is dumped to.
     """
     bug_output = self.SendShellCommand("bugreport", timeout_time=60)
     bugreport_file = open(path, "w")
     bugreport_file.write(bug_output)
@@ skipping 48 matching lines @@
 
   def EnableAdbRoot(self):
     """Enable adb root on device."""
     output = self.SendCommand("root")
     if "adbd is already running as root" in output:
       return True
     elif "restarting adbd as root" in output:
       # device will disappear from adb, wait for it to come back
       self.SendCommand("wait-for-device")
       return True
+    elif "adbd cannot run as root" in output:
+      return False
     else:
       logger.Log("Unrecognized output from adb root: %s" % output)
       return False
 
   def StartInstrumentationForPackage(
       self, package_name, runner_name, timeout_time=60*10,
       no_window_animation=False, instrumentation_args={}):
     """Run instrumentation test for given package and runner.
 
     Equivalent to StartInstrumentation, except instrumentation path is
@@ skipping 334 matching lines @@
       # press the MENU key, this will disable key guard if runtime is started
       # with ro.monkey set to 1
       self.SendShellCommand("input keyevent 82", retry_count=retry_count)
     else:
       self.WaitForDevicePm()
     return output
 
   def GetSerialNumber(self):
     """Returns the serial number of the targeted device."""
     return self.SendCommand("get-serialno").strip()