Make step status EXCEPTION when test runner has infrastructure failure.

scripts/slave/recipe_modules/amp/api.py

 # Copyright 2015 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.
 
 from slave import recipe_api
 
 
 class AmpApi(recipe_api.RecipeApi):
 
   def __init__(self, *args, **kwargs):
     super(AmpApi, self).__init__(*args, **kwargs)
     self._trigger_file_dir = None
     self._base_results_dir = None
 
+  def setup(self):
+    """Call this once before any of the other APIs in this module."""

[jbudorick, 2015/02/27 15:17:26]

This should be rephrased.

+    self.m.chromium_android.set_config('base_config')
+
   @recipe_api.non_step
   def _get_trigger_dir(self):
     if not self._trigger_file_dir:
       self._trigger_file_dir = self.m.path.mkdtemp('amp_trigger')
     return self._trigger_file_dir
 
   @recipe_api.non_step
   def _get_trigger_file_for_suite(self, suite):
     return self._get_trigger_dir().join('%s.json' % suite)
 
@@ skipping 28 matching lines @@
       'env': {
         'device': {
           'brand': 'Foo',
           'name': 'Fone',
           'os_version': '1.2.3',
         },
       },
     })
     step_result = self.m.python(
         '[trigger] %s' % suite,
-        self.m.path['checkout'].join('build', 'android', 'test_runner.py'),
+        self.m.chromium_android.c.test_runner,
         args=args,
         step_test_data=step_test_data)
     trigger_data = step_result.json.output
     try:
       device_data = trigger_data['env']['device']
       step_result.presentation.step_text = 'on %s %s %s' % (
           device_data['brand'],
           device_data['name'],
           device_data['os_version'])
     except KeyError:
@@ skipping 30 matching lines @@
           device_data['os_version'])
     except KeyError:
       device_data = None
       device_info_text = 'unable to find device info'
 
     if verbose:
       args += ['--verbose']
     try:
       step_result = self.m.python(
           '[collect] %s' % suite,
-          self.m.path['checkout'].join('build', 'android', 'test_runner.py'),
+          self.m.chromium_android.c.test_runner,
           args=args)
     except self.m.step.StepFailure as f:
       step_result = f.result
       raise
     finally:
       step_result.presentation.step_text = device_info_text
+      if (step_result.retcode ==
+          self.m.chromium_android.c.test_runner_exit_codes['INFRA']):
+        step_result.presentation.status = self.m.step.EXCEPTION
       if (not device_data and
-          step_result.presentation.status != self.m.step.FAILURE):
+          step_result.presentation.status == self.m.step.SUCCESS):

[mikecase (-- gone --), 2015/02/27 18:10:58]

Also will need to add this logic to the trigger step which I forgot to do. Am
thinking of just adding a function like handle_test_runner_step_results (with a
better name if I can think of one) in chromium_android api and just set the step
status there. 

         step_result.presentation.status = self.m.step.WARNING
 
   def upload_logcat_to_gs(self, bucket, suite):
     """Upload the logcat file returned from the appurify results to
     Google Storage.
     """
     step_result = self.m.json.read(
         '[upload logcat] load %s data' % suite,
         self._get_trigger_file_for_suite(suite),
         step_test_data=lambda: self.m.json.test_api.output({
@@ skipping 111 matching lines @@
       amp_args += ['--device-oem', d]
 
     for d in device_os or []:
       amp_args += ['--remote-device-os', d]
 
     if device_timeout:
       amp_args += ['--remote-device-timeout', device_timeout]
 
     return amp_args