[Android] Fix miscellaneous small issues with gtest platform mode.

build/android/pylib/local/device/local_device_test_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 logging
 
 from devil.android import device_errors
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
@@ skipping 11 matching lines @@
     try:
       return f(dev, *args, **kwargs)
     except device_errors.CommandFailedError:
       logging.exception('Shard failed: %s(%s)', f.__name__, str(dev))
     except device_errors.CommandTimeoutError:
       logging.exception('Shard timed out: %s(%s)', f.__name__, str(dev))
     except device_errors.DeviceUnreachableError:
       logging.exception('Shard died: %s(%s)', f.__name__, str(dev))
     return None
 
+  wrapper.__name__ = f.__name__
   return wrapper
 
 
 class LocalDeviceTestRun(test_run.TestRun):
 
   def __init__(self, env, test_instance):
     super(LocalDeviceTestRun, self).__init__(env, test_instance)
     self._tools = {}
 
   #override
   def RunTests(self):
     tests = self._GetTests()
 
+    def run_test(dev, test):
+      try:
+        return self._RunTest(dev, test)
+      except device_errors.CommandFailedError:
+        logging.exception('Test failed: %s', test)
+      except device_errors.CommandTimeoutError:
+        logging.exception('Test timed out: %s', test)
+      return None
+
     @handle_shard_failures
     def run_tests_on_device(dev, tests, results):
       for test in tests:
+        result = None
         try:
-          result = self._RunTest(dev, test)
-          if isinstance(result, base_test_result.BaseTestResult):
-            results.AddResult(result)
-          elif isinstance(result, list):
-            results.AddResults(result)
-          else:
-            raise Exception(
-                'Unexpected result type: %s' % type(result).__name__)
-        except:
-          if isinstance(tests, test_collection.TestCollection):
-            tests.add(test)
-          raise
+          result = run_test(dev, test)
         finally:
           if isinstance(tests, test_collection.TestCollection):
+            if not result:
+              tests.add(test)
             tests.test_completed()
+
+        if isinstance(result, base_test_result.BaseTestResult):
+          results.AddResult(result)
+        elif isinstance(result, list):
+          results.AddResults(result)
+
       logging.info('Finished running tests on this device.')
 
     tries = 0
     results = base_test_result.TestRunResults()
     all_fail_results = {}
     while tries < self._env.max_tries and tests:
       logging.info('STARTING TRY #%d/%d', tries + 1, self._env.max_tries)
       logging.info('Will run %d tests on %d devices: %s',
                    len(tests), len(self._env.devices),
                    ', '.join(str(d) for d in self._env.devices))
@@ skipping 55 matching lines @@
     return test
 
   def _GetTests(self):
     raise NotImplementedError
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError