[Android] Fix the reference to timed_out in BaseTestSharder retry logic.

build/android/pylib/base/base_test_sharder.py

 # Copyright (c) 2012 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
 import multiprocessing
 
 from pylib import android_commands
 from pylib.base.test_result import TestResults
@@ skipping 109 matching lines @@
         self.attached_devices = android_commands.GetAttachedDevices()
         continue
       test_results = TestResults.FromTestResults(results_lists)
       # Re-check the attached devices for some devices may
       # become offline
       retry_devices = set(android_commands.GetAttachedDevices())
       # Remove devices that had exceptions.
       retry_devices -= TestResults.DeviceExceptions(results_lists)
       # Retry on devices that didn't have any exception.
       self.attached_devices = list(retry_devices)
+
+      # TODO(frankf): Fix the retry logic:
+      # - GetAllBroken() should report all tests not ran.
+      # - Do not break TestResults encapsulation.
       if (retry == self.retries - 1 or
           len(self.attached_devices) == 0):
         all_passed = final_results.ok + test_results.ok
         final_results = test_results
         final_results.ok = all_passed
         break
       else:
         final_results.ok += test_results.ok
-        # Timed out tests are not reported in GetAllBroken().
-        if test_results.timed_out:
-          final_results.timed_out = True
+        final_results.overall_timed_out = (final_results.overall_timed_out or
+                                           test_results.overall_timed_out)
+        final_results.overall_fail = (final_results.overall_fail or
+                                      test_results.overall_fail)
+
         self.tests = []
         for t in test_results.GetAllBroken():
           self.tests += [t.name]
         if not self.tests:
           break
     else:
       # We ran out retries, possibly out of healthy devices.
       # There's no recovery at this point.
       raise Exception('Unrecoverable error while retrying test runs.')
     self.OnTestsCompleted(test_runners, final_results)
     self._KillHostForwarder()
     return final_results