Updating perf recipe for disabled chartjson data.

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 659 matching lines @@
 
   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)
+  if chartjson_data:
+    with open(chartjson_file, 'w') as f:
+      json.dump(chartjson_data[1], 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.
 
   Returns:
     True if no errors occurred.
   """
   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 True
 
   results = None
   if log_processor.IsChartJson():
-    results = _GenerateDashboardJson(log_processor, args)
-    if not results:
+    chartjson_results = _GenerateDashboardJson(log_processor, args)
+    if not chartjson_results:
       print 'Error: No json output from telemetry.'
       print '@@@STEP_FAILURE@@@'
     log_processor.Cleanup()
+    if not chartjson_results:
+      return False
+    if chartjson_results[0]:
+      # This benchmark was disabled so don't send results to the dashboard
+      # but it was a successful run.
+      return True
+    results = chartjson_results[1]
   else:
     charts = _GetDataFromLogProcessor(log_processor)
     results = results_dashboard.MakeListOfPoints(
         charts, args['system'], args['test'], args['buildername'],
         args['buildnumber'], args['supplemental_columns'])
 
   if not results:
     return False
 
   logging.debug(json.dumps(results, indent=2))
-  return results_dashboard.SendResults(results, args['url'], args['build_dir'])
+  return results_dashboard.SendResults(
+    results, args['url'], args['build_dir'])

[perezju, 2016/09/22 08:50:27]

nit: two extra indent spaces

[eyaich1, 2016/09/26 15:22:11]

Done.

 
 
 def _GetDataFromLogProcessor(log_processor):
   """Returns a mapping of chart names to chart data.
 
   Args:
     log_processor: A log processor (aka results tracker) object.
 
   Returns:
     A dictionary mapping chart name to lists of chart data.
@@ skipping 1178 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())