Increase Android test robustness.

build/android/test_result.py

 # Copyright (c) 2011 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
 
 
 # Language values match constants in Sponge protocol buffer (sponge.proto).
 JAVA = 5
@@ skipping 39 matching lines @@
 class TestResults(object):
   """Results of a test run."""
 
   def __init__(self):
     self.ok = []
     self.failed = []
     self.crashed = []
     self.unknown = []
     self.disabled = []
     self.unexpected_pass = []
+    self.timed_out = False
 
   @staticmethod
-  def FromOkAndFailed(ok, failed):
+  def FromOkAndFailed(ok, failed, timed_out=False):
     ret = TestResults()
     ret.ok = ok
     ret.failed = failed
+    ret.timed_out = timed_out
     return ret
 
   @staticmethod
   def FromTestResults(results):
     """Combines a list of results in a single TestResults object."""
     ret = TestResults()
     for t in results:
       ret.ok += t.ok
       ret.failed += t.failed
       ret.crashed += t.crashed
       ret.unknown += t.unknown
       ret.disabled += t.disabled
       ret.unexpected_pass += t.unexpected_pass
+      if t.timed_out:
+        ret.timed_out = True
     return ret
 
   def _Log(self, sorted_list):
     for t in sorted_list:
       logging.critical(t.name)
       if t.log:
         logging.critical(t.log)
 
   def GetAllBroken(self):
     """Returns the all broken tests including failed, crashed, unknown."""
     return self.failed + self.crashed + self.unknown
 
   def LogFull(self):
     """Output all broken tests or 'passed' if none broken"""
     logging.critical('*' * 80)
     logging.critical('Final result')
     if self.failed:
       logging.critical('Failed:')
       self._Log(sorted(self.failed))
     if self.crashed:
       logging.critical('Crashed:')
       self._Log(sorted(self.crashed))
     if self.unknown:
       logging.critical('Unknown:')
       self._Log(sorted(self.unknown))
     if not self.GetAllBroken():
       logging.critical('Passed')
     logging.critical('*' * 80)