Make step status EXCEPTION when test runner has infrastructure failure.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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 os
 import re
 import urllib
 
 from infra.libs.infra_types import freeze
 from slave import recipe_api
@@ skipping 389 matching lines @@
                        infra_step=True,
                        env=self.m.chromium.get_env())
 
   def monkey_test(self, **kwargs):
     args = [
         'monkey',
         '-v',
         '--package=%s' % self.c.channel,
         '--event-count=50000'
     ]
-    return self.m.python(
+    return self.test_runner(
         'Monkey Test',
-        self.c.test_runner,
         args,
         env={'BUILDTYPE': self.c.BUILD_CONFIG},
         **kwargs)
 
 
   def _run_sharded_tests(self,
                          config='sharded_perf_tests.json',
                          flaky_config=None,
                          chartjson_output=False,
                          **kwargs):
     args = ['perf', '--release', '--verbose', '--steps', config]
     if flaky_config:
       args.extend(['--flaky-steps', flaky_config])
     args.extend(['--collect-chartjson-data'] if chartjson_output else [])
 
-    self.m.python(
+    self.test_runner(
         'Sharded Perf Tests',
-        self.c.test_runner,
         args,
         cwd=self.m.path['checkout'],
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_sharded_perf_tests(self, config, flaky_config=None, perf_id=None,
                              test_type_transform=lambda x: x,
                              chartjson_file=False, **kwargs):
     """Run the perf tests from the given config file.
 
@@ skipping 94 matching lines @@
     if self.c.coverage:
       args.extend(['--coverage-dir', self.coverage_dir,
                    '--python-only'])
     if host_driven_root:
       args.extend(['--host-driven-root', host_driven_root])
     if official_build:
       args.extend(['--official-build'])
     if json_results_file:
       args.extend(['--json-results-file', json_results_file])
 
-    return self.m.python(
+    return self.test_runner(
         'Instrumentation test %s%s' % (annotation or test_apk,
                                        ' (%s)' % suffix if suffix else ''),
-        self.c.test_runner,
         args=['instrumentation'] + args,
         **kwargs)
 
   def logcat_dump(self, gs_bucket=None):
     if gs_bucket:
       log_path = self.m.chromium.output_dir.join('full_log')
       self.m.python(
           'logcat_dump',
           self.m.path['checkout'].join('build', 'android',
                                        'adb_logcat_printer.py'),
@@ skipping 111 matching lines @@
     if gtest_filter:
       args.append('--gtest_filter=%s' % gtest_filter)
     if tool:
       args.append('--tool=%s' % tool)
     if flakiness_dashboard:
       args.append('--flakiness-dashboard-server=%s' %
           flakiness_dashboard)
     if json_results_file:
       args.extend(['--json-results-file', json_results_file])
 
-    self.m.python(
+    self.test_runner(
         name or str(suite),
-        self.c.test_runner,
         ['gtest', '-s', suite] + args,
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_java_unit_test_suite(self, suite, verbose=True, **kwargs):
     args = []
     if verbose:
       args.append('--verbose')
     if self.c.BUILD_CONFIG == 'Release':
       args.append('--release')
 
-    self.m.python(
+    self.test_runner(
         str(suite),
-        self.c.test_runner,
         ['junit', '-s', suite] + args,
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def run_python_unit_test_suite(self, suite, verbose=True, **kwargs):
     args = []
     if verbose:
       args.append('--verbose')
 
-    self.m.python(
+    self.test_runner(
         str(suite),
-        self.c.test_runner,
         ['python', '-s', suite] + args,
         env=self.m.chromium.get_env(),
         **kwargs)
 
   def coverage_report(self, **kwargs):
     assert self.c.coverage, (
         'Trying to generate coverage report but coverage is not enabled')
     gs_dest = 'java/%s/%s' % (
         self.m.properties['buildername'], self.m.properties['revision'])
 
@@ skipping 11 matching lines @@
 
     self.m.gsutil.upload(
         source=self.coverage_dir.join('coverage_html'),
         bucket='chrome-code-coverage',
         dest=gs_dest,
         args=['-R'],
         name='upload coverage report',
         link_name='Coverage report',
         version='4.7',
         **kwargs)
+
+  def test_runner(self, step_name, args=None, **kwargs):
+    """Wrapper for the python testrunner script.
+
+    Args:
+      step_name: Name of the step.
+      args: Testrunner arguments.
+    """
+    EXIT_CODES = {
+      'error': 1,
+      'infra': 87,
+      'warning': 88,
+    }
+    try:
+      step_result = self.m.python(
+          step_name, self.c.test_runner, args, **kwargs)
+      return step_result
+    except self.m.step.StepFailure as f:
+      step_result = f.result
+      raise
+    finally:
+      if (step_result.retcode == EXIT_CODES['error']):
+        step_result.presentation.status = self.m.step.FAILURE
+      elif (step_result.retcode == EXIT_CODES['infra']):
+        step_result.presentation.status = self.m.step.EXCEPTION
+      elif (step_result.retcode == EXIT_CODES['warning']):
+        step_result.presentation.status = self.m.step.WARNING