Outputting chart json for disabled tests.

telemetry/telemetry/internal/story_runner.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 logging
 import optparse
 import os
 import sys
 import time
 
@@ skipping 262 matching lines @@
 
 def RunBenchmark(benchmark, finder_options):
   """Run this test with the given options.
 
   Returns:
     The number of failure values (up to 254) or 255 if there is an uncaught
     exception.
   """
   benchmark.CustomizeBrowserOptions(finder_options.browser_options)
 
+  benchmark_metadata = benchmark.GetMetadata()
   possible_browser = browser_finder.FindBrowser(finder_options)
   if possible_browser and benchmark.ShouldDisable(possible_browser):
     logging.warning('%s is disabled on the selected browser', benchmark.Name())
     if finder_options.run_disabled_tests:
       logging.warning(
           'Running benchmark anyway due to: --also-run-disabled-tests')
     else:
       logging.warning(
           'Try --also-run-disabled-tests to force the benchmark to run.')
+      # If chartjson is specified, this will print a dict indicating the
+      # benchmark name and disabled state.  crrev.com/2265423005 will update
+      # this return value once this logic is plumbed through the recipe.
+      with results_options.CreateResults(benchmark_metadata, finder_options,
+          benchmark.ValueCanBeAddedPredicate) as results:
+        results.PrintDisabledSummary()
       return 1
 
   pt = benchmark.CreatePageTest(finder_options)
   pt.__name__ = benchmark.__class__.__name__
 
   disabled_attr_name = decorators.DisabledAttributeName(benchmark)
   # pylint: disable=protected-access
   pt._disabled_strings = getattr(benchmark, disabled_attr_name, set())
   if hasattr(benchmark, '_enabled_strings'):
     # pylint: disable=protected-access
     pt._enabled_strings = benchmark._enabled_strings
 
   stories = benchmark.CreateStorySet(finder_options)
   if isinstance(pt, legacy_page_test.LegacyPageTest):
     if any(not isinstance(p, page.Page) for p in stories.stories):
       raise Exception(
           'PageTest must be used with StorySet containing only '
           'telemetry.page.Page stories.')
 
   should_tear_down_state_after_each_story_run = (
       benchmark.ShouldTearDownStateAfterEachStoryRun())
   # HACK: restarting shared state has huge overhead on cros (crbug.com/645329),
   # hence we default this to False when test is run against CrOS.
   # TODO(cros-team): figure out ways to remove this hack.
   if (possible_browser.platform.GetOSName() == 'chromeos' and
       not benchmark.IsShouldTearDownStateAfterEachStoryRunOverriden()):
     should_tear_down_state_after_each_story_run = False
 
-  benchmark_metadata = benchmark.GetMetadata()
+
   with results_options.CreateResults(
       benchmark_metadata, finder_options,
       benchmark.ValueCanBeAddedPredicate) as results:
     try:
       Run(pt, stories, finder_options, results, benchmark.max_failures,
           should_tear_down_state_after_each_story_run,
           benchmark.ShouldTearDownStateAfterEachStorySetRun())
       return_code = min(254, len(results.failures))
     except Exception:
       exception_formatter.PrintFormattedException()
@@ skipping 88 matching lines @@
     logging.warning('Device is thermally throttled before running '
                     'performance tests, results will vary.')
 
 
 def _CheckThermalThrottling(platform):
   if not platform.CanMonitorThermalThrottling():
     return
   if platform.HasBeenThermallyThrottled():
     logging.warning('Device has been thermally throttled during '
                     'performance tests, results will vary.')