devil: Fix exit code handling when greping through lsof.

devil/devil/android/device_utils.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.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 1037 matching lines @@
       if not output:
         return ''
       elif len(output) == 1:
         return output[0]
       else:
         msg = 'one line of output was expected, but got: %s'
         raise device_errors.CommandFailedError(msg % output, str(self))
     else:
       return output
 
-  def _RunPipedShellCommand(self, script, **kwargs):
+  def _RunPipedShellCommand(self, script, check_return=True, **kwargs):
     PIPESTATUS_LEADER = 'PIPESTATUS: '
 
     script += '; echo "%s${PIPESTATUS[@]}"' % PIPESTATUS_LEADER
-    kwargs.update(shell=True, check_return=True)
+    kwargs.update(shell=True)
     output = self.RunShellCommand(script, **kwargs)
     pipestatus_line = output[-1]
 
     if not pipestatus_line.startswith(PIPESTATUS_LEADER):
       logger.error('Pipe exit statuses of shell script missing.')
       raise device_errors.AdbShellCommandFailedError(
           script, output, status=None,
           device_serial=self.serial)
 
     output = output[:-1]
     statuses = [
         int(s) for s in pipestatus_line[len(PIPESTATUS_LEADER):].split()]
-    if any(statuses):
+    if check_return and any(statuses):
       raise device_errors.AdbShellCommandFailedError(
           script, output, status=statuses,
           device_serial=self.serial)
     return output
 
   @decorators.WithTimeoutAndRetriesFromInstance()
   def KillAll(self, process_name, exact=False, signum=device_signal.SIGKILL,
               as_root=False, blocking=False, quiet=False,
               timeout=None, retries=None):
     """Kill all processes with the given name on the device.
@@ skipping 277 matching lines @@
         except device_errors.AdbShellCommandFailedError as e:
           # TODO(crbug.com/739899): This is attempting to diagnose flaky EBUSY
           # errors that have been popping up in single-device scenarios.
           # Remove it once we've figured out what's causing them and how best
           # to handle them.
           m = _EBUSY_RE.search(e.output)
           if m:
             logging.error(
                 'Hit EBUSY while attempting to make missing directories.')
             logging.error('lsof output:')
-            for l in self._RunPipedShellCommand(
-                'lsof | grep %s' % cmd_helper.SingleQuote(m.group(1))):
+            cmd = 'lsof | grep %s' % cmd_helper.SingleQuote(m.group(1))
+            for l in self._RunPipedShellCommand(cmd, check_return=False):
               logging.error('  %s', l)
           raise
       self._PushFilesImpl(host_device_tuples, all_changed_files)
     for func in cache_commit_funcs:
       func()
 
   def _GetChangedAndStaleFiles(self, host_path, device_path, track_stale=False):
     """Get files to push and delete
 
     Args:
@@ skipping 1385 matching lines @@
       on: bool to decide state to switch to. True = on False = off.
     """
     def screen_test():
       return self.IsScreenOn() == on
 
     if screen_test():
       logger.info('Screen already in expected state.')
       return
     self.SendKeyEvent(keyevent.KEYCODE_POWER)
     timeout_retry.WaitFor(screen_test, wait_period=1)