[devil refactor] Prepare clients for DeviceUnreachableError

build/android/pylib/local/device/local_device_perf_test_run.py

 # Copyright 2016 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.
 
 import collections
 import io
 import json
 import logging
 import os
 import pickle
@@ skipping 227 matching lines @@
     for test in self._tests:
       tries_left = self._retries
       result_type = None
       while (result_type != base_test_result.ResultType.PASS
              and tries_left > 0):
         try:
           self._TestSetUp(test)
           result_type = self._RunSingleTest(test)
         except device_errors.CommandTimeoutError:
           result_type = base_test_result.ResultType.TIMEOUT
-        except device_errors.CommandFailedError:
+        except (device_errors.CommandFailedError,
+                device_errors.DeviceUnreachableError):
           logging.exception('Exception when executing %s.', test)
           result_type = base_test_result.ResultType.FAIL
         finally:
           self._TestTearDown()
           if result_type != base_test_result.ResultType.PASS:
             try:
               device_recovery.RecoverDevice(self._device, self._env.blacklist)
             except device_errors.CommandTimeoutError:
               logging.exception(
                   'Device failed to recover after failing %s.', test)
@@ skipping 270 matching lines @@
   # override
   def _RunTest(self, _device, _test):
     raise NotImplementedError
 
 
 class TestDictVersionError(Exception):
   pass
 
 class PerfTestRunGetStepsError(Exception):
   pass