Display telemetry chartjson output and result data on waterfall.

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool used to run a Chrome test executable and process the output.
 
 This script is used by the buildbot slaves. It must be run from the outer
 build directory, e.g. chrome-release/build/.
 
@@ skipping 683 matching lines @@
       'mastername': options.build_properties.get('mastername'),
       'buildername': options.build_properties.get('buildername'),
       'buildnumber': options.build_properties.get('buildnumber'),
       'build_dir': build_dir,
       'supplemental_columns': supplemental_columns,
       'revisions': _GetTelemetryRevisions(options),
   }
   return fields
 
 
+def _GenerateDashboardJson(log_processor, args):
+  """Generates chartjson to send to the dashboard.
+
+  Args:
+    log_processor: An instance of a log processor class, which has been used to
+        process the test output, so it contains the test results.
+    args: Dict of additional args to send to results_dashboard.
+  """
+  assert log_processor.IsChartJson()
+
+  chart_json = log_processor.ChartJson()
+  if chart_json:
+    return results_dashboard.MakeDashboardJsonV1(
+        chart_json,
+        args['revisions'], args['system'], args['mastername'],
+        args['buildername'], args['buildnumber'],
+        args['supplemental_columns'], log_processor.IsReferenceBuild())
+  return None
+
+
+def _WriteChartJsonToOutput(chartjson_file, log_processor, args):
+  """Writes the dashboard chartjson to a file for display in the waterfall.
+
+  Args:
+  chartjson_file: Path to the file to write the chartjson.
+    log_processor: An instance of a log processor class, which has been used to
+        process the test output, so it contains the test results.
+    args: Dict of additional args to send to results_dashboard.
+  """
+  assert log_processor.IsChartJson()
+
+  chartjson_data = _GenerateDashboardJson(log_processor, args)
+
+  with open(chartjson_file, 'w') as f:
+    json.dump(chartjson_data, f)
+
+
 def _SendResultsToDashboard(log_processor, args):
   """Sends results from a log processor instance to the dashboard.
 
   Args:
     log_processor: An instance of a log processor class, which has been used to
         process the test output, so it contains the test results.
     args: Dict of additional args to send to results_dashboard.
   """
   if args['system'] is None:
     # perf_id not specified in factory properties.
     print 'Error: No system name (perf_id) specified when sending to dashboard.'
     return
 
   results = None
   if log_processor.IsChartJson():
-    chart_json = log_processor.ChartJson()
-    if chart_json:
-      results = results_dashboard.MakeDashboardJsonV1(
-          chart_json,
-          args['revisions'], args['system'], args['mastername'],
-          args['buildername'], args['buildnumber'],
-          args['supplemental_columns'], log_processor.IsReferenceBuild())
-    else:
+    results = _GenerateDashboardJson(log_processor, args)
+    if not results:
       print 'Error: No json output from telemetry.'
       print '@@@STEP_FAILURE@@@'
     log_processor.Cleanup()
   else:
     charts = _GetDataFromLogProcessor(log_processor)
     results = results_dashboard.MakeListOfPoints(
         charts, args['system'], args['test'], args['mastername'],
         args['buildername'], args['buildnumber'], args['supplemental_columns'])
   if results:
     logging.debug(json.dumps(results, indent=2))
@@ skipping 376 matching lines @@
   if options.generate_json_file:
     if not _GenerateJSONForTestResults(options, log_processor):
       return 1
 
   if options.annotate:
     annotation_utils.annotate(
         options.test_type, result, log_processor,
         options.factory_properties.get('full_test_name'),
         perf_dashboard_id=options.perf_dashboard_id)
 
+  if options.chartjson_file and telemetry_info:
+    _WriteChartJsonToOutput(options.chartjson_file,
+                            log_processor,
+                            _ResultsDashboardDict(options))
+
   if options.results_url:
     _SendResultsToDashboard(log_processor, _ResultsDashboardDict(options))
 
   return result
 
 
 def _MainIOS(options, args, extra_env):
   """Runs the test on iOS."""
   if len(args) < 1:
     raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
@@ skipping 252 matching lines @@
   if options.generate_json_file:
     if not _GenerateJSONForTestResults(options, log_processor):
       return 1
 
   if options.annotate:
     annotation_utils.annotate(
         options.test_type, result, log_processor,
         options.factory_properties.get('full_test_name'),
         perf_dashboard_id=options.perf_dashboard_id)
 
+  if options.chartjson_file and telemetry_info:
+    _WriteChartJsonToOutput(options.chartjson_file,
+                            log_processor,
+                            _ResultsDashboardDict(options))
+
   if options.results_url:
     _SendResultsToDashboard(log_processor, _ResultsDashboardDict(options))
 
   return result
 
 
 def _MainWin(options, args, extra_env):
   """Runs tests on windows.
 
   Using the target build configuration, run the executable given in the
@@ skipping 97 matching lines @@
   if options.generate_json_file:
     if not _GenerateJSONForTestResults(options, log_processor):
       return 1
 
   if options.annotate:
     annotation_utils.annotate(
         options.test_type, result, log_processor,
         options.factory_properties.get('full_test_name'),
         perf_dashboard_id=options.perf_dashboard_id)
 
+  if options.chartjson_file and telemetry_info:
+    _WriteChartJsonToOutput(options.chartjson_file,
+                            log_processor,
+                            _ResultsDashboardDict(options))
+
   if options.results_url:
     _SendResultsToDashboard(log_processor, _ResultsDashboardDict(options))
 
   return result
 
 
 def _MainAndroid(options, args, extra_env):
   """Runs tests on android.
 
   Running GTest-based tests on android is different than on Linux as it requires
@@ skipping 60 matching lines @@
   Ensures that --output=chartjson is set and adds a --output argument.
 
   Arguments:
     args: list of command line arguments, starts with 'run_benchmark' for
           telemetry tests.
 
   Returns:
     None if not a telemetry test, otherwise a
     dict containing the output filename and whether it is a reference build.
   """
-  # Temporarily revert while investigating crbug.com/423034
-  # pylint: disable=W0101
-  return {}
   if not args[0].endswith('run_benchmark'):
     # Not a telemetry run
     return None
 
   is_ref = '--browser=reference' in args
 
   if '--output-format=buildbot' in args:
     args[args.index('--output-format=buildbot')] = '--output-format=chartjson'
 
   output_dir = tempfile.mkdtemp()
@@ skipping 87 matching lines @@
   option_parser.add_option('--xvfb', action='store_true', dest='xvfb',
                            default=True,
                            help='Start virtual X server on Linux.')
   option_parser.add_option('--no-xvfb', action='store_false', dest='xvfb',
                            help='Do not start virtual X server on Linux.')
   option_parser.add_option('--sharding-args', dest='sharding_args',
                            default='',
                            help='Options to pass to sharding_supervisor.')
   option_parser.add_option('-o', '--results-directory', default='',
                            help='output results directory for JSON file.')
+  option_parser.add_option('--chartjson-file', default='',
+                           help='File to dump chartjson results.')
   option_parser.add_option('--builder-name', default=None,
                            help='The name of the builder running this script.')
   option_parser.add_option('--slave-name', default=None,
                            help='The name of the slave running this script.')
   option_parser.add_option('--master-class-name', default=None,
                            help='The class name of the buildbot master running '
                                 'this script: examples include "Chromium", '
                                 '"ChromiumWebkit", and "ChromiumGPU". The '
                                 'flakiness dashboard uses this value to '
                                 'categorize results. See buildershandler.py '
@@ skipping 305 matching lines @@
   finally:
     if did_launch_dbus:
       # It looks like the command line argument --exit-with-session
       # isn't working to clean up the spawned dbus-daemon. Kill it
       # manually.
       _ShutdownDBus()
 
 
 if '__main__' == __name__:
   sys.exit(main())