[Android] Try harder to run every gtest within each try.

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 fnmatch
 import imp
 import logging
 import posixpath
 import signal
 import thread
@@ skipping 55 matching lines @@
 
     exit_now = threading.Event()
 
     @local_device_environment.handle_shard_failures
     def run_tests_on_device(dev, tests, results):
       for test in tests:
         if exit_now.isSet():
           thread.exit()
 
         result = None
+        rerun = None
         try:
-          result = self._RunTest(dev, test)
+          result, rerun = 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)
+            rerun = test
           raise
         finally:
           if isinstance(tests, test_collection.TestCollection):
+            if rerun:
+              tests.add(rerun)
             tests.test_completed()
 
-
       logging.info('Finished running tests on this device.')
 
     class TestsTerminated(Exception):
       pass
 
     def stop_tests(_signum, _frame):
       logging.critical('Received SIGTERM. Stopping test execution.')
       exit_now.set()
       raise TestsTerminated()
 
     try:
       with signal_handler.SignalHandler(signal.SIGTERM, stop_tests):
         tries = 0
         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))
           for t in tests:
             logging.debug('  %s', t)
 
           try_results = base_test_result.TestRunResults()
           test_names = (self._GetUniqueTestName(t) for t in tests)
           try_results.AddResults(
               base_test_result.BaseTestResult(
-                  t, base_test_result.ResultType.UNKNOWN)
+                  t, base_test_result.ResultType.NOTRUN)
               for t in test_names if not t.endswith('*'))
 
           try:
             if self._ShouldShard():
               tc = test_collection.TestCollection(self._CreateShards(tests))
               self._env.parallel_devices.pMap(
                   run_tests_on_device, tc, try_results).pGet(None)
             else:
               self._env.parallel_devices.pMap(
                   run_tests_on_device, tests, try_results).pGet(None)
@@ skipping 66 matching lines @@
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError
 
 
 class NoTestsError(Exception):
   """Error for when no tests are found."""