Android: Propagate timeouts when sharding(and retrying) tests.

build/android/pylib/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 android_commands
 import logging
 import multiprocessing
 
 from android_commands import errors
@@ skipping 118 matching lines @@
       # Retry on devices that didn't have any exception.
       self.attached_devices = list(retry_devices)
       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
         self.tests = []
         for t in test_results.GetAllBroken():
           self.tests += [t.name]

[frankf, 2013/01/09 22:11:28]

@Craig: Lines 133-143 are completely breaking the encapsulation of TestResults
objects and making the code unreadable. I don't mind this hack going in for now,
but we need to refactor this soon.

         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