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

build/android/pylib/local/device/local_device_gtest_run.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.
 
 import collections
 import itertools
 import logging
 import os
 import posixpath
 
@@ skipping 214 matching lines @@
       self._delegate = _ExeDelegate(self, self._test_instance.exe_dist_dir)
     self._crashes = set()
     self._servers = collections.defaultdict(list)
 
   #override
   def TestPackage(self):
     return self._test_instance.suite
 
   #override
   def SetUp(self):
-    @local_device_test_run.handle_shard_failures_with(
+    @local_device_environment.handle_shard_failures_with(
         on_failure=self._env.BlacklistDevice)
     def individual_device_set_up(dev):
       def install_apk():
         # Install test APK.
         self._delegate.Install(dev)
 
       def push_test_data():
         # Push data dependencies.
         device_root = posixpath.join(dev.GetExternalStoragePath(),
                                      'chromium_tests_root')
@@ skipping 60 matching lines @@
       # When the exact list of tests to run is given via command-line (e.g. when
       # locally iterating on a specific test), skip querying the device (which
       # takes ~3 seconds).
       tests = _ExtractTestsFromFilter(self._test_instance.gtest_filter)
       if tests:
         return tests
 
     # Even when there's only one device, it still makes sense to retrieve the
     # test list so that tests can be split up and run in batches rather than all
     # at once (since test output is not streamed).
-    @local_device_test_run.handle_shard_failures_with(
+    @local_device_environment.handle_shard_failures_with(
         on_failure=self._env.BlacklistDevice)
     def list_tests(dev):
       raw_test_list = self._delegate.Run(
           None, dev, flags='--gtest_list_tests', timeout=30)
       tests = gtest_test_instance.ParseGTestListTests(raw_test_list)
       if not tests:
         logging.info('No tests found. Output:')
         for l in raw_test_list:
           logging.info('  %s', l)
       tests = self._test_instance.FilterTests(tests)
@@ skipping 29 matching lines @@
     # TODO(jbudorick): Transition test scripts away from parsing stdout.
     results = gtest_test_instance.ParseGTestOutput(output)
 
     # Check whether there are any crashed testcases.
     self._crashes.update(r.GetName() for r in results
                          if r.GetType() == base_test_result.ResultType.CRASH)
     return results
 
   #override
   def TearDown(self):
-    @local_device_test_run.handle_shard_failures
+    @local_device_environment.handle_shard_failures
     def individual_device_tear_down(dev):
       for s in self._servers.get(str(dev), []):
         s.TearDown()
 
       tool = self.GetTool(dev)
       tool.CleanUpEnvironment()
 
     self._env.parallel_devices.pMap(individual_device_tear_down)