Update from https://crrev.com/311076

build/android/pylib/remote/device/remote_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.
 
 """Run specific test on specific environment."""
 
 import logging
 import os
 import sys
 import tempfile
 import time
 import zipfile
 
 from pylib import constants
 from pylib.base import test_run
 from pylib.remote.device import appurify_sanitized
 from pylib.remote.device import remote_device_helper
 from pylib.utils import zip_utils
 
 class RemoteDeviceTestRun(test_run.TestRun):
   """Run gtests and uirobot tests on a remote device."""
 
   WAIT_TIME = 5
   COMPLETE = 'complete'
+  HEARTBEAT_INTERVAL = 300
 
   def __init__(self, env, test_instance):
     """Constructor.
 
     Args:
       env: Environment the tests will run in.
       test_instance: The test that will be run.
     """
     super(RemoteDeviceTestRun, self).__init__(env, test_instance)
     self._env = env
     self._test_instance = test_instance
     self._app_id = ''
     self._test_id = ''
     self._results = ''
     self._test_run_id = ''
-    self._current_status = ''
 
   #override
   def RunTests(self):
     """Run the test."""
     if self._env.trigger:
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         test_start_res = appurify_sanitized.api.tests_run(
             self._env.token, self._env.device, self._app_id, self._test_id)
       remote_device_helper.TestHttpResponse(
         test_start_res, 'Unable to run test.')
       self._test_run_id = test_start_res.json()['response']['test_run_id']
       logging.info('Test run id: %s' % self._test_run_id)
       if not self._env.collect:
         assert isinstance(self._env.trigger, basestring), (
                           'File for storing test_run_id must be a string.')
         with open(self._env.trigger, 'w') as test_run_id_file:
           test_run_id_file.write(self._test_run_id)
 
     if self._env.collect:
       if not self._env.trigger:
         assert isinstance(self._env.trigger, basestring), (
                           'File for storing test_run_id must be a string.')
         with open(self._env.collect, 'r') as test_run_id_file:
           self._test_run_id = test_run_id_file.read().strip()
+      current_status = ''
+      timeout_counter = 0
+      heartbeat_counter = 0
       while self._GetTestStatus(self._test_run_id) != self.COMPLETE:
+        if self._results['detailed_status'] != current_status:
+          logging.info('Test status: %s', self._results['detailed_status'])
+          current_status = self._results['detailed_status']
+          timeout_counter = 0
+          heartbeat_counter = 0
+        if heartbeat_counter > self.HEARTBEAT_INTERVAL:
+          logging.info('Test status: %s', self._results['detailed_status'])
+          heartbeat_counter = 0
+
+        timeout = self._env.timeouts.get(
+            current_status, self._env.timeouts['unknown'])
+        if timeout_counter > timeout:
+          raise remote_device_helper.RemoteDeviceError(
+              'Timeout while in %s state for %s seconds'
+              % (current_status, timeout))
         time.sleep(self.WAIT_TIME)
+        timeout_counter += self.WAIT_TIME
+        heartbeat_counter += self.WAIT_TIME
       self._DownloadTestResults(self._env.results_path)
       return self._ParseTestResults()
 
   #override
   def TearDown(self):
     """Tear down the test run."""
     if (self._env.collect
         and self._GetTestStatus(self._test_run_id) != self.COMPLETE):
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
@@ skipping 63 matching lines @@
       test_run_id: Id of test on on remote service.
     """
 
     with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                             logging.WARNING):
       test_check_res = appurify_sanitized.api.tests_check_result(
           self._env.token, test_run_id)
     remote_device_helper.TestHttpResponse(test_check_res,
                                           'Unable to get test status.')
     self._results = test_check_res.json()['response']
-    if self._results['detailed_status'] != self._current_status:
-      logging.info('Test status: %s', self._results['detailed_status'])
-      self._current_status = self._results['detailed_status']
     return self._results['status']
 
   def _AmInstrumentTestSetup(self, app_path, test_path, runner_package):
     config = {'runner': runner_package}
 
     self._app_id = self._UploadAppToDevice(app_path)
 
     data_deps = self._test_instance.GetDataDependencies()
     if data_deps:
       with tempfile.NamedTemporaryFile(suffix='.zip') as test_with_deps:
@@ skipping 13 matching lines @@
             'robotium', test_with_deps.name)
     else:
       self._test_id = self._UploadTestToDevice('robotium', test_path)
 
     logging.info('Setting config: %s' % config)
     self._SetTestConfig('robotium', config)
 
   def _UploadAppToDevice(self, app_path):
     """Upload app to device."""
     logging.info('Uploading %s to remote service.', app_path)
-    apk_name = os.path.basename(app_path)
     with open(app_path, 'rb') as apk_src:
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         upload_results = appurify_sanitized.api.apps_upload(
-            self._env.token, apk_src, 'raw', name=apk_name)
+            self._env.token, apk_src, 'raw', name=self._test_instance.suite)
       remote_device_helper.TestHttpResponse(
           upload_results, 'Unable to upload %s.' % app_path)
       return upload_results.json()['response']['app_id']
 
   def _UploadTestToDevice(self, test_type, test_path):
     """Upload test to device
     Args:
       test_type: Type of test that is being uploaded. Ex. uirobot, gtest..
     """
     logging.info('Uploading %s to remote service.' % test_path)
@@ skipping 17 matching lines @@
       config_data.extend('%s=%s' % (k, v) for k, v in body.iteritems())
       config.write(''.join('%s\n' % l for l in config_data))
       config.flush()
       config.seek(0)
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         config_response = appurify_sanitized.api.config_upload(
             self._env.token, config, self._test_id)
       remote_device_helper.TestHttpResponse(
           config_response, 'Unable to upload test config.')