[telemetry] Add Html2OutputFormatter for generating results2.html

telemetry/telemetry/internal/results/results_options.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 codecs
 import optparse
 import os
 import sys
 
 from catapult_base import cloud_storage  # pylint: disable=import-error
 
 from telemetry.core import util
 from telemetry.internal.results import buildbot_output_formatter
 from telemetry.internal.results import chart_json_output_formatter
 from telemetry.internal.results import csv_pivot_table_output_formatter
 from telemetry.internal.results import gtest_progress_reporter
 from telemetry.internal.results import html_output_formatter
+from telemetry.internal.results import html2_output_formatter
 from telemetry.internal.results import json_output_formatter
 from telemetry.internal.results import page_test_results
 from telemetry.internal.results import progress_reporter
 
 # Allowed output formats. The default is the first item in the list.
-_OUTPUT_FORMAT_CHOICES = ('html', 'buildbot', 'gtest', 'json',
+_OUTPUT_FORMAT_CHOICES = ('html', 'html2', 'buildbot', 'gtest', 'json',
     'chartjson', 'csv-pivot-table', 'none')
 
 
 # Filenames to use for given output formats.
 _OUTPUT_FILENAME_LOOKUP = {
     'html': 'results.html',
+    'html2': 'results2.html',
     'json': 'results.json',
     'chartjson': 'results-chart.json',
     'csv-pivot-table': 'results-pivot-table.csv'
 }
 
 
 def AddResultsOptions(parser):
   group = optparse.OptionGroup(parser, 'Results options')
   group.add_option('--output-format', action='append', dest='output_formats',
                     choices=_OUTPUT_FORMAT_CHOICES, default=[],
@@ skipping 49 matching lines @@
       'Cannot set stream for \'gtest\' or \'none\' output formats.')
 
   if output_format == 'buildbot':
     return sys.stdout
 
   assert output_format in _OUTPUT_FILENAME_LOOKUP, (
       'No known filename for the \'%s\' output format' % output_format)
   output_file = os.path.join(output_dir, _OUTPUT_FILENAME_LOOKUP[output_format])
 
   # TODO(eakuefner): Factor this hack out after we rewrite HTMLOutputFormatter.
-  if output_format == 'html':
+  if output_format == 'html' or output_format == 'html2':
     open(output_file, 'a').close() # Create file if it doesn't exist.
-    return open(output_file, 'r+')
+    return codecs.open(output_file, 'r+', 'utf-8')
   else:
-    return open(output_file, 'w+')
+    return codecs.open(output_file, 'w+', 'utf-8')
 
 
 def _GetProgressReporter(output_skipped_tests_summary, suppress_gtest_report):
   if suppress_gtest_report:
     return progress_reporter.ProgressReporter()
 
   return gtest_progress_reporter.GTestProgressReporter(
       sys.stdout, output_skipped_tests_summary=output_skipped_tests_summary)
 
 
@@ skipping 26 matching lines @@
       # file.  Another option for this is to output the results directly
       # in gtest-style results (via some sort of progress reporter),
       # as we plan to enable gtest-style output for all output formatters.
       output_formatters.append(
           buildbot_output_formatter.BuildbotOutputFormatter(
               sys.stdout, trace_tag=options.output_trace_tag))
       output_formatters.append(html_output_formatter.HtmlOutputFormatter(
           output_stream, benchmark_metadata, options.reset_results,
           options.upload_results, options.browser_type,
           options.results_label))
+    elif output_format == 'html2':
+      output_formatters.append(html2_output_formatter.Html2OutputFormatter(
+          output_stream, options.reset_results, options.upload_results))
     elif output_format == 'json':
       output_formatters.append(json_output_formatter.JsonOutputFormatter(
           output_stream, benchmark_metadata))
     elif output_format == 'chartjson':
       output_formatters.append(
           chart_json_output_formatter.ChartJsonOutputFormatter(
               output_stream, benchmark_metadata))
     else:
       # Should never be reached. The parser enforces the choices.
       raise Exception('Invalid --output-format "%s". Valid choices are: %s'
                       % (output_format, ', '.join(_OUTPUT_FORMAT_CHOICES)))
 
   # TODO(chrishenry): This is here to not change the output of
   # gtest. Let's try enabling skipped tests summary for gtest test
   # results too (in a separate patch), and see if we break anything.
   output_skipped_tests_summary = 'gtest' in options.output_formats
 
   reporter = _GetProgressReporter(output_skipped_tests_summary,
                                   options.suppress_gtest_report)
   return page_test_results.PageTestResults(
       output_formatters=output_formatters, progress_reporter=reporter,
       output_dir=options.output_dir,
       value_can_be_added_predicate=value_can_be_added_predicate)