[devil] Raise DeviceUnreachableError on device not found

devil/devil/android/forwarder.py

 # Copyright (c) 2012 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.
 
 # pylint: disable=W0212
 
 import fcntl
 import logging
 import os
 import psutil
@@ skipping 28 matching lines @@
         logger.info('    %s', line)
   except Exception: # pylint: disable=broad-except
     # Grabbing the host forwarder log is best-effort. Ignore all errors.
     logger.warning('Failed to get the contents of host_forwarder_log.')
 
   # The device forwarder daemon logs to the logcat, so print the end of that.
   try:
     logger.info('Last 50 lines of logcat:')
     for logcat_line in device.adb.Logcat(dump=True)[-50:]:
       logger.info('    %s', logcat_line)
-  except device_errors.CommandFailedError:
+  except (device_errors.CommandFailedError,
+          device_errors.DeviceUnreachableError):
     # Grabbing the device forwarder log is also best-effort. Ignore all errors.
     logger.warning('Failed to get the contents of the logcat.')
 
   # Log alive device forwarders.
   try:
     ps_out = device.RunShellCommand(['ps'], check_return=True)
     logger.info('Currently running device_forwarders:')
     for line in ps_out:
       if 'device_forwarder' in line:
         logger.info('    %s', line)
-  except device_errors.CommandFailedError:
+  except (device_errors.CommandFailedError,
+          device_errors.DeviceUnreachableError):
     logger.warning('Failed to list currently running device_forwarder '
                    'instances.')
 
 
 class _FileLock(object):
   """With statement-aware implementation of a file lock.
 
   File locks are needed for cross-process synchronization when the
   multiprocessing Python module is used.
   """
@@ skipping 76 matching lines @@
               '`%s` timed out:\n%s' % (' '.join(map_cmd), e.output))
         except OSError as e:
           if e.errno == 2:
             raise HostForwarderError(
                 'Unable to start host forwarder. '
                 'Make sure you have built host_forwarder.')
           else: raise
         if exit_code != 0:
           try:
             instance._KillDeviceLocked(device, tool)
-          except device_errors.CommandFailedError:
+          except (device_errors.CommandFailedError,
+                  device_errors.DeviceUnreachableError):
             # We don't want the failure to kill the device forwarder to
             # supersede the original failure to map.
             logging.warning(
                 'Failed to kill the device forwarder after map failure: %s',
                 str(e))
           _LogMapFailureDiagnostics(device)
           formatted_output = ('\n'.join(output) if isinstance(output, list)
                               else output)
           raise HostForwarderError(
               '`%s` exited with %d:\n%s' % (
@@ skipping 287 matching lines @@
     if not device.FileExists(Forwarder._DEVICE_FORWARDER_PATH):
       return
 
     cmd = [Forwarder._DEVICE_FORWARDER_PATH, '--kill-server']
     wrapper = tool.GetUtilWrapper()
     if wrapper:
       cmd.insert(0, wrapper)
     device.RunShellCommand(
         cmd, env={'LD_LIBRARY_PATH': Forwarder._DEVICE_FORWARDER_FOLDER},
         check_return=True)