New run shell implementation for DeviceUtils

build/android/pylib/device/device_errors.py

 # Copyright 2014 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.
 
 """
 Exception classes raised by AdbWrapper and DeviceUtils.
 """
 
 class BaseError(Exception):
   """Base exception for all device and command errors."""
   pass
 
 
 class CommandFailedError(BaseError):
   """Exception for command failures."""
 
   def __init__(self, msg, device=None):
     super(CommandFailedError, self).__init__(
         '%s%s' % ('(device: %s) ' % device if device else '', msg))
 
 
 class AdbCommandFailedError(CommandFailedError):
   """Exception for adb command failures."""
 
   def __init__(self, cmd, msg, device=None):
     super(AdbCommandFailedError, self).__init__(
-        'adb command \'%s\' failed with message: \'%s\'' % (' '.join(cmd), msg),
+        'adb command %r failed with message: %r' % (' '.join(cmd), msg),
         device=device)
 
 
+class AdbShellCommandFailedError(CommandFailedError):

[jbudorick, 2014/10/17 09:04:53]

This should inherit from AdbCommandFailedError.

[perezju, 2014/10/17 11:17:09]

Done.

The new version will output something like:

AdbShellCommandFailedError: (device: 0123456789abcdef) adb command 'shell'
failed with message: command 'ls /root' on device failed with return code 1 and
output 'opendir failed, Permission denied\r\n'

+  """Exception for adb shell command failing with non-zero return code."""
+
+  def __init__(self, cmd, return_code, output, device=None):
+    super(AdbShellCommandFailedError, self).__init__(
+        'adb shell command %r failed with return code %d and output %r' %

[jbudorick, 2014/10/17 09:04:53]

You may want to rephrase this to distinguish the exception message from the
content, i.e., quote the command, return code, and output (or some other
delineator).

[perezju, 2014/10/17 11:17:09]

That's what %r does :)

And the return code should be a number, so %d

[jbudorick, 2014/10/17 15:48:00]

Oh, neat. I didn't know about %r and somehow read it as %s.

+        (cmd, return_code, output), device=device)
+    self.return_code = return_code
+    self.output = output
+
+
 class CommandTimeoutError(BaseError):
   """Exception for command timeouts."""
   pass
 
 
 class DeviceUnreachableError(BaseError):
   """Exception for device unreachable failures."""
   pass
 
 
 class NoDevicesError(BaseError):
   """Exception for having no devices attached."""
 
   def __init__(self):
     super(NoDevicesError, self).__init__('No devices attached.')