[Android] Blacklist devices on failures during environment set up + tear down.

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 io
 import json
 import logging
 import os
 import pickle
 import shutil
 import tempfile
 import time
 import zipfile
 
 from devil.android import battery_utils
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import forwarder
 from devil.android.tools import device_recovery
 from devil.android.tools import device_status
 from devil.utils import cmd_helper
 from devil.utils import parallelizer
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.constants import host_paths
+from pylib.local.device import local_device_environment
 from pylib.local.device import local_device_test_run
 
 
 class TestShard(object):
   def __init__(
       self, env, test_instance, device, index, tests, retries=3, timeout=None):
     logging.info('Create shard %s for device %s to run the following tests:',
                  index, device)
     for t in tests:
       logging.info('  %s', t)
     self._battery = battery_utils.BatteryUtils(device)
     self._device = device
     self._env = env
     self._index = index
     self._output_dir = None
     self._retries = retries
     self._test_instance = test_instance
     self._tests = tests
     self._timeout = timeout
 
-  @local_device_test_run.handle_shard_failures
+  @local_device_environment.handle_shard_failures
   def RunTestsOnShard(self):
     results = base_test_result.TestRunResults()
     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)
@@ skipping 318 matching lines @@
   # override
   def _RunTest(self, _device, _test):
     raise NotImplementedError
 
 
 class TestDictVersionError(Exception):
   pass
 
 class PerfTestRunGetStepsError(Exception):
   pass