Add step to process Render Test results.

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 contextlib
 import datetime
 import json
 import os
 import pipes
 import re
@@ skipping 880 matching lines @@
                                 apk_package=None,
                                 official_build=False,
                                 json_results_file=None,
                                 timeout_scale=None, strict_mode=None,
                                 suffix=None, num_retries=None,
                                 device_flags=None,
                                 wrapper_script_suite_name=None,
                                 result_details=False,
                                 cs_base_url=None,
                                 store_tombstones=False,
+                                render_results_dir=None,
                                 **kwargs):
     args = [
       '--blacklist-file', self.blacklist_file,
     ]
     if tool:
       args.append('--tool=%s' % tool)
     if flakiness_dashboard:
       args.extend(['--flakiness-dashboard-server', flakiness_dashboard])
     if annotation:
       args.extend(['-A', annotation])
@@ skipping 39 matching lines @@
         annotation or name, ' (%s)' % suffix if suffix else '')
 
     try:
       step_result = self.test_runner(
           step_name,
           args=args,
           wrapper_script_suite_name=wrapper_script_suite_name,
           **kwargs)
     finally:
       result_step = self.m.step.active_result
+      if render_results_dir:
+        self._upload_render_test_failures(render_results_dir)
       if result_details:
         if (hasattr(result_step, 'test_utils') and
             hasattr(result_step.test_utils, 'gtest_results')):
           json_results = self.m.json.input(
               result_step.test_utils.gtest_results.raw)
           details = self.create_result_details(step_name,
                                                json_results,
                                                cs_base_url)
           self.m.step.active_result.presentation.logs[
               'result_details'] = details
-        self.copy_gtest_results(result_step,
-                                self.m.step.active_result)
-    return step_result
+      # Need to copy gtest results over. A few places call
+      # |run_instrumentation_suite| function and then look for results in
+      # the active_result.
+      self.copy_gtest_results(result_step,
+                              self.m.step.active_result)

[mikecase (-- gone --), 2016/10/25 20:53:34]

So, idk what you think about this. But if render_results_dir is passed, and
results_details=False, then if the bot also uses the code in steps.py to run
their tests, the results of the test run will get printed to the "[Render Tests]
Process render tests" step.

I think* I know a work-around to this. Which would involve either (1) Using a
nested step in steps.py and printing the results to the outer nested step. Or
(2) move some of the logic done in steps.py into this function.

Or, I could change this CL like how it was in the initial patch and move
upload_render_test_failures out of this function.

[jbudorick, 2016/10/25 21:37:32]

As written, this is kind of nasty but does work. I don't like the original patch
because it won't work well on bots w/ instrumentation tests specified in src/.
(1) could be reasonable. (2) depends on what logic you mean.

 
   def copy_gtest_results(self, result_step, active_step):
     if (hasattr(result_step, 'test_utils') and
         hasattr(result_step.test_utils, 'gtest_results')):
       active_step.test_utils = result_step.test_utils
 
   def create_result_details(self, step_name, json_results_file, cs_base_url):
     presentation_args = ['--json-file',
                          json_results_file,
                          '--master-name',
                          self.m.properties.get('mastername')]
     if cs_base_url:
       presentation_args.extend(['--cs-base-url', cs_base_url])
     result_details = self.m.python(
         '%s: generate result details' % step_name,
         self.resource('test_results_presentation.py'),
         args=presentation_args,
         stdout=self.m.raw_io.output(),
         step_test_data=(
             lambda: self.m.raw_io.test_api.stream_output(
                 '<!DOCTYPE html><html></html>')))
     return result_details.stdout.splitlines()
 
+  def _upload_render_test_failures(self, render_results_dir):
+    """Uploads render test results. Generates HTML file displaying results."""
+    args = ['--output-html-file', self.m.raw_io.output(),
+            '--buildername', self.m.properties['buildername'],
+            '--build-number', self.m.properties['buildnumber'],
+            '--render-results-dir', render_results_dir]
+    step_result = self.m.python(
+        name='[Render Tests] Upload Results',
+        script=self.m.path['checkout'].join(
+            'build', 'android', 'render_tests',
+            'process_render_test_results.py'),
+        args=args,
+        step_test_data=lambda: self.m.raw_io.test_api.output(
+            '<!DOCTYPE html><html></html>'))
+    step_result.presentation.logs['render results'] = (
+        step_result.raw_io.output.splitlines())
+
   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'),
           [ '--output-path', log_path,
             self.m.path['checkout'].join('out', 'logcat') ],
           infra_step=True)
@@ skipping 560 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)