[telemetry] test_runner and run_benchmarks

tools/telemetry/telemetry/page/page_measurement.py

 # 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.
 import os
 import sys
 
 from telemetry.page import block_page_measurement_results
 from telemetry.page import buildbot_page_measurement_results
 from telemetry.page import csv_page_measurement_results
 from telemetry.page import page_measurement_results
@@ skipping 52 matching lines @@
                       help='Redirects output to a file. Defaults to stdout.')
     parser.add_option('--output-trace-tag',
                       default='',
                       help='Append a tag to the key of each result trace.')
 
   @property
   def output_format_choices(self):
     return ['buildbot', 'block', 'csv', 'none']
 
   def PrepareResults(self, options):
-    if not options.output_file or options.output_file == '-':
+    if hasattr(options, 'output_file') and options.output_file:
+      output_stream = open(os.path.expanduser(options.output_file), 'w')
+    else:
       output_stream = sys.stdout
-    else:
-      output_stream = open(os.path.expanduser(options.output_file), 'w')
+    if not hasattr(options, 'output_format'):
+      options.output_format = self.output_format_choices[0]
+    if not hasattr(options, 'output_trace_tag'):
+      options.output_trace_tag = ''
 
     if options.output_format == 'csv':
       return csv_page_measurement_results.CsvPageMeasurementResults(
         output_stream,
-        self.results_are_the_same_on_every_page,
-        trace_tag=options.output_trace_tag)
+        self.results_are_the_same_on_every_page)
     elif options.output_format == 'block':
       return block_page_measurement_results.BlockPageMeasurementResults(
         output_stream)
     elif options.output_format == 'buildbot':
       return buildbot_page_measurement_results.BuildbotPageMeasurementResults(
           trace_tag=options.output_trace_tag)
     elif options.output_format == 'none':
       return page_measurement_results.PageMeasurementResults(
           trace_tag=options.output_trace_tag)
     else:
@@ skipping 27 matching lines @@
 
     Put together:
 
        def MeasurePage(self, page, tab, results):
          res = tab.EvaluateJavaScript('2+2')
          if res != 4:
            raise Exception('Oh, wow.')
          results.Add('two_plus_two', 'count', res)
     """
     raise NotImplementedError()