[android] Add better test result info on swarming timeout.

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 signal
 import thread
 import threading
 
 from devil.utils import signal_handler
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.base import test_collection
 from pylib.local.device import local_device_environment
 
 
+_SIGTERM_TEST_LOG = (
+  '  Suite execution terminated, probably due to swarming timeout.\n'
+  '  Your test may not have run.')
+
+
 def IncrementalInstall(device, apk_helper, installer_script):
   """Performs an incremental install.
 
   Args:
     device: Device to install on.
     apk_helper: ApkHelper instance for the _incremental.apk.
     installer_script: Path to the installer script for the incremental apk.
   """
   try:
     install_wrapper = imp.load_source('install_wrapper', installer_script)
@@ skipping 76 matching lines @@
               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)
+          except TestsTerminated:
+            for unknown_result in try_results.GetUnknown():
+              try_results.AddResult(
+                  base_test_result.BaseTestResult(
+                      unknown_result.GetName(),
+                      base_test_result.ResultType.TIMEOUT,
+                      log=_SIGTERM_TEST_LOG))
+            raise
           finally:
             results.append(try_results)
 
           tries += 1
           tests = self._GetTestsToRetry(tests, try_results)
 
           logging.info('FINISHED TRY #%d/%d', tries, self._env.max_tries)
           if tests:
             logging.info('%d failed tests remain.', len(tests))
           else:
@@ skipping 48 matching lines @@
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError
 
 
 class NoTestsError(Exception):
   """Error for when no tests are found."""