Chromium roll (https://codereview.chromium.org/976353002)

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 json
 import logging
 import os
 import sys
@@ skipping 75 matching lines @@
           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))
+              % (current_status, timeout),
+              is_infra_error=True)
         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:
@@ skipping 163 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.')