Increase Android test robustness.

build/android/test_package.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
 import re
 import os
 import pexpect
 
@@ skipping 110 matching lines @@
         ret += [current + test_name]
     return ret
 
   def _WatchTestOutput(self, p):
     """Watches the test output.
     Args:
       p: the process generating output as created by pexpect.spawn.
     """
     ok_tests = []
     failed_tests = []
+    timed_out = False
     re_run = re.compile('\[ RUN      \] ?(.*)\r\n')
     re_fail = re.compile('\[  FAILED  \] ?(.*)\r\n')
     re_ok = re.compile('\[       OK \] ?(.*)\r\n')
     (io_stats_before, ready_to_continue) = self._BeginGetIOStats()
     while ready_to_continue:
       found = p.expect([re_run, pexpect.EOF], timeout=self.timeout)
       if found == 1:  # matched pexpect.EOF
         break
       if self.dump_debug_info:
         self.dump_debug_info.TakeScreenshot('_Test_Start_Run_')
       full_test_name = p.match.group(1)
       found = p.expect([re_ok, re_fail, pexpect.EOF, pexpect.TIMEOUT],
                        timeout=self.timeout)
       if found == 0:  # re_ok
         ok_tests += [BaseTestResult(full_test_name.replace('\r', ''),
                                     p.before)]
         continue
       failed_tests += [BaseTestResult(full_test_name.replace('\r', ''),
                                       p.before)]
       if found >= 2:
         # The test crashed / bailed out (i.e., didn't print OK or FAIL).
         if found == 3:  # pexpect.TIMEOUT
           logging.error('Test terminated after %d second timeout.',
                         self.timeout)
+          timed_out = True
         break
     p.close()
     if not self.rebaseline and ready_to_continue:
       ok_tests += self._EndGetIOStats(io_stats_before)
       ret_code = self._GetGTestReturnCode()
       if ret_code:
         failed_tests += [BaseTestResult('gtest exit code: %d' % ret_code,
                                         'pexpect.before: %s'
                                         '\npexpect.after: %s'
                                         % (p.before,
                                            p.after))]
-    return TestResults.FromOkAndFailed(ok_tests, failed_tests)
+    return TestResults.FromOkAndFailed(ok_tests, failed_tests, timed_out)