[devil refactor] Prepare clients for DeviceUnreachableError

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/android.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 775 matching lines @@
         self._push_file_if_needed(self._port._build_path('android_main_fonts.xml'),
                                   self._driver_details.device_directory() + 'android_main_fonts.xml', log_callback)
         self._push_file_if_needed(self._port._build_path('android_fallback_fonts.xml'),
                                   self._driver_details.device_directory() + 'android_fallback_fonts.xml', log_callback)
 
         try:
             driver_host_path = self._port._path_to_driver()  # pylint: disable=protected-access
             log_callback('installing apk if necessary')
             self._device.Install(driver_host_path)
         except (device_errors.CommandFailedError,
-                device_errors.CommandTimeoutError) as exc:
+                device_errors.CommandTimeoutError,
+                device_errors.DeviceUnreachableError) as exc:
             self._abort('Failed to install %s onto device: %s' % (driver_host_path, str(exc)))
 
     def _push_fonts(self, log_callback):
         path_to_ahem_font = self._port._build_path('AHEM____.TTF')
         self._push_file_if_needed(path_to_ahem_font, self._driver_details.device_fonts_directory() + 'AHEM____.TTF', log_callback)
         for (host_dirs, font_file, _) in HOST_FONT_FILES:
             for host_dir in host_dirs:
                 host_font_path = host_dir + font_file
                 if self._port._check_file_exists(host_font_path, '', more_logging=False):
                     self._push_file_if_needed(
@@ skipping 319 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char