Write results2.html for TBMv2 benchmarks if --output-format=html.

telemetry/telemetry/internal/results/html_output_formatter.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 datetime
 import json
 import logging
 import os
 import re
 
 from py_utils import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import util
 from telemetry.internal.results import chart_json_output_formatter
+from telemetry.internal.results import html2_output_formatter
 from telemetry.internal.results import output_formatter
 from telemetry import value as value_module
 from telemetry.value import list_of_scalar_values
 
 
 _TEMPLATE_HTML_PATH = os.path.join(
     util.GetTelemetryDir(), 'support', 'html_output', 'results-template.html')
 _JS_PLUGINS = [os.path.join('flot', 'jquery.flot.min.js'),
                os.path.join('WebKit', 'PerformanceTests', 'resources',
                             'jquery.tablesorter.min.js'),
@@ skipping 13 matching lines @@
 
 # TODO(eakuefner): rewrite template to use Telemetry JSON directly
 class HtmlOutputFormatter(output_formatter.OutputFormatter):
   def __init__(self, output_stream, metadata, reset_results, upload_results,
       browser_type, results_label=None):
     super(HtmlOutputFormatter, self).__init__(output_stream)
     self._metadata = metadata
     self._reset_results = reset_results
     self._upload_results = upload_results
     self._build_time = self._GetBuildTime()
-    self._existing_results = self._ReadExistingResults(output_stream)
+    self._combined_results = []
     if results_label:
       self._results_label = results_label
     else:
       self._results_label = '%s (%s)' % (
           metadata.name, _ShortDatetimeInEs5CompatibleFormat(self._build_time))
     self._result = {
         'buildTime': _DatetimeInEs5CompatibleFormat(self._build_time),
         'label': self._results_label,
         'platform': browser_type,
         'tests': {}
@@ skipping 86 matching lines @@
                               value.units, result_type, std)
 
   @property
   def _test_name(self):
     return self._metadata.name
 
   def GetResults(self):
     return self._result
 
   def GetCombinedResults(self):
-    all_results = list(self._existing_results)
-    all_results.append(self.GetResults())
-    return all_results
+    return self._combined_results
 
   def Format(self, page_test_results):
+    if page_test_results.value_set:
+      html2_formatter = html2_output_formatter.Html2OutputFormatter(
+          self._output_stream, self._reset_results, self._upload_results)
+      html2_formatter.Format(page_test_results)
+      return
+
     chart_json_dict = chart_json_output_formatter.ResultsAsChartDict(
         self._metadata, page_test_results.all_page_specific_values,
         page_test_results.all_summary_values)
 
     self._TranslateChartJson(chart_json_dict)
     self._PrintPerfResult('telemetry_page_measurement_results', 'num_failed',
                           [len(page_test_results.failures)], 'count',
                           'unimportant')
 
+    self._combined_results = self._ReadExistingResults(self._output_stream)
+    self._combined_results.append(self._result)
+
     html = self._GetHtmlTemplate()
     html = html.replace('%json_results%', json.dumps(self.GetCombinedResults()))
     html = html.replace('%json_units%', self._GetUnitJson())
     html = html.replace('%plugins%', self._GetPlugins())
     self._SaveResults(html)
 
     if self._upload_results:
       file_path = os.path.abspath(self._output_stream.name)
       file_name = 'html-results/results-%s' % datetime.datetime.now().strftime(
           '%Y-%m-%d_%H-%M-%S')
       try:
         cloud_storage.Insert(cloud_storage.PUBLIC_BUCKET, file_name, file_path)
         print
         print ('View online at '
                'http://storage.googleapis.com/chromium-telemetry/%s'
                % file_name)
       except cloud_storage.PermissionError as e:
         logging.error('Cannot upload profiling files to cloud storage due to '
                       ' permission error: %s' % e.message)
     print
     print 'View result at file://%s' % os.path.abspath(
         self._output_stream.name)