Outputting chart json for disabled tests.

telemetry/telemetry/internal/results/page_test_results.py

 # Copyright 2014 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 collections
 import copy
 import datetime
 import logging
 import random
 import sys
@@ skipping 92 matching lines @@
     d['storyGroupingKeys'] = self.story_grouping_keys
     d['storyRepeatCounter'] = self.story_repeat_counter
     d['storyUrl'] = self.story_url
     d['storysetRepeatCounter'] = self.storyset_repeat_counter
     return d
 
 
 class PageTestResults(object):
   def __init__(self, output_formatters=None,
                progress_reporter=None, trace_tag='', output_dir=None,
-               value_can_be_added_predicate=lambda v, is_first: True):
+               value_can_be_added_predicate=lambda v, is_first: True,
+               benchmark_enabled=True):
     """
     Args:
       output_formatters: A list of output formatters. The output
           formatters are typically used to format the test results, such
           as CsvPivotTableOutputFormatter, which output the test results as CSV.
       progress_reporter: An instance of progress_reporter.ProgressReporter,
           to be used to output test status/results progressively.
       trace_tag: A string to append to the buildbot trace name. Currently only
           used for buildbot.
       output_dir: A string specified the directory where to store the test
@@ skipping 25 matching lines @@
     self._pages_to_profiling_files = collections.defaultdict(list)
     self._pages_to_profiling_files_cloud_url = collections.defaultdict(list)
 
     # You'd expect this to be a set(), but Values are dictionaries, which are
     # unhashable. We could wrap Values with custom __eq/hash__, but we don't
     # actually need set-ness in python.
     self._value_set = []
 
     self._iteration_info = IterationInfo()
 
+    # State of the benchmark this set of results represents.
+    self._benchmark_enabled = benchmark_enabled
+
   @property
   def iteration_info(self):
     return self._iteration_info
 
   @property
   def value_set(self):
     return self._value_set
 
   def __copy__(self):
     cls = self.__class__
@@ skipping 100 matching lines @@
       page: The current page under test.
     """
     assert self._current_page_run, 'Did not call WillRunPage.'
     self._progress_reporter.DidRunPage(self)
     self._all_page_runs.append(self._current_page_run)
     self._all_stories.add(self._current_page_run.story)
     self._current_page_run = None
 
   def AddValue(self, value):
     assert self._current_page_run, 'Not currently running test.'
+    assert self._benchmark_enabled, 'Cannot add value to disabled results'
     self._ValidateValue(value)
     is_first_result = (
       self._current_page_run.story not in self._all_stories)
 
     story_keys = self._current_page_run.story.grouping_keys
 
     if story_keys:
       for k, v in story_keys.iteritems():
         assert k not in value.grouping_keys, (
             'Tried to add story grouping key ' + k + ' already defined by ' +
@@ skipping 28 matching lines @@
 
   def _ValidateValue(self, value):
     assert isinstance(value, value_module.Value)
     if value.name not in self._representative_value_for_each_value_name:
       self._representative_value_for_each_value_name[value.name] = value
     representative_value = self._representative_value_for_each_value_name[
         value.name]
     assert value.IsMergableWith(representative_value)
 
   def PrintSummary(self):
-    self._progress_reporter.DidFinishAllTests(self)
+    if self._benchmark_enabled:
+      self._progress_reporter.DidFinishAllTests(self)
 
-    # Only serialize the trace if output_format is json.
-    if (self._output_dir and
-        any(isinstance(o, json_output_formatter.JsonOutputFormatter)
-            for o in self._output_formatters)):
-      self._SerializeTracesToDirPath(self._output_dir)
-    for output_formatter in self._output_formatters:
-      output_formatter.Format(self)
+      # Only serialize the trace if output_format is json.
+      if (self._output_dir and
+          any(isinstance(o, json_output_formatter.JsonOutputFormatter)
+              for o in self._output_formatters)):
+        self._SerializeTracesToDirPath(self._output_dir)
+      for output_formatter in self._output_formatters:
+        output_formatter.Format(self)
+    else:
+      for output_formatter in self._output_formatters:
+        output_formatter.FormatDisabled(self)
 
   def FindValues(self, predicate):
     """Finds all values matching the specified predicate.
 
     Args:
       predicate: A function that takes a Value and returns a bool.
     Returns:
       A list of values matching |predicate|.
     """
     values = []
@@ skipping 37 matching lines @@
         try:
           cloud_url = cloud_storage.Insert(
               bucket, remote_path, file_handle.GetAbsPath())
           sys.stderr.write(
               'View generated profiler files online at %s for page %s\n' %
               (cloud_url, page.display_name))
           self._pages_to_profiling_files_cloud_url[page].append(cloud_url)
         except cloud_storage.PermissionError as e:
           logging.error('Cannot upload profiling files to cloud storage due to '
                         ' permission error: %s' % e.message)