Make step status EXCEPTION when test runner has infrastructure failure.

scripts/slave/recipe_modules/amp/api.py

Index: scripts/slave/recipe_modules/amp/api.py
diff --git a/scripts/slave/recipe_modules/amp/api.py b/scripts/slave/recipe_modules/amp/api.py
index 454d73b0222312a090cb13619b3f266d46dc636c..4a6585579427336817c49a866a4c769815d60cdc 100644
--- a/scripts/slave/recipe_modules/amp/api.py
+++ b/scripts/slave/recipe_modules/amp/api.py
@@ -12,6 +12,10 @@ class AmpApi(recipe_api.RecipeApi):
     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:
@@ -60,7 +64,7 @@ class AmpApi(recipe_api.RecipeApi):
     })
     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
@@ -111,15 +115,18 @@ class AmpApi(recipe_api.RecipeApi):
     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):