Add an "in_unit_test_mode" attribute to the environment. Use this to default output format to 'gtes…

tools/telemetry/telemetry/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 optparse
 import os
 import sys
 
 from telemetry.core import util
-from telemetry.page import page_measurement
 from telemetry.results import block_page_measurement_results
 from telemetry.results import buildbot_page_measurement_results
 from telemetry.results import csv_page_measurement_results
 from telemetry.results import gtest_test_results
 from telemetry.results import html_page_measurement_results
 from telemetry.results import page_measurement_results
 
 
 # Allowed output formats. The default is the first item in the list.
 _OUTPUT_FORMAT_CHOICES = ('html', 'buildbot', 'block', 'csv', 'gtest', 'none')
@@ skipping 16 matching lines @@
                     help='Delete all stored results.')
   group.add_option('--upload-results', action='store_true',
                     help='Upload the results to cloud storage.')
   group.add_option('--results-label',
                     default=None,
                     help='Optional label to use for the results of a run .')
   parser.add_option_group(group)
 
 
 def PrepareResults(test, options):
-  if not isinstance(test, page_measurement.PageMeasurement):
-    # Sort of hacky. The default for non-Measurements should be "gtest."
-    if options.output_format != 'none':
-      options.output_format = 'gtest'
-
   if options.output_format == 'html' and not options.output_file:
     options.output_file = os.path.join(util.GetBaseDir(), 'results.html')
 
   if hasattr(options, 'output_file') and options.output_file:
     output_file = os.path.expanduser(options.output_file)
     open(output_file, 'a').close()  # Create file if it doesn't exist.
     output_stream = open(output_file, 'r+')
   else:
     output_stream = sys.stdout
   if not hasattr(options, 'output_format'):
@@ skipping 18 matching lines @@
   elif options.output_format == 'html':
     return html_page_measurement_results.HtmlPageMeasurementResults(
         output_stream, test.__class__.__name__, options.reset_results,
         options.upload_results, options.browser_type,
         options.results_label, trace_tag=options.output_trace_tag)
   else:
     # Should never be reached. The parser enforces the choices.
     raise Exception('Invalid --output-format "%s". Valid choices are: %s'
                     % (options.output_format,
                        ', '.join(_OUTPUT_FORMAT_CHOICES)))