Outputting chart json for disabled tests.

telemetry/telemetry/internal/story_runner.py

Index: telemetry/telemetry/internal/story_runner.py
diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
index 278a4cf358b60daeb1cfd9367a650b7e86f7e97f..a688e06b0529be5d3301d6c1cd8a4c4cfef9e514 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -280,6 +280,7 @@ def RunBenchmark(benchmark, finder_options):
   """
   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())
@@ -289,6 +290,14 @@ def RunBenchmark(benchmark, finder_options):
     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, benchmark_enabled=False
+          ) as results:
+        results.PrintSummary()
       return 1
 
   pt = benchmark.CreatePageTest(finder_options)
@@ -317,7 +326,7 @@ def RunBenchmark(benchmark, finder_options):
       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:

[nednguyen, 2016/09/26 17:23:11]

Set benchmark_enabled here to True as well. It's better not to rely on default
value of parameters

Would be nice if we can merge this with the part of creating results option
above, but it's up to you whether to merge them.

[eyaich1, 2016/09/26 17:27:50]

First part done.

I looked at that earlier but given that the PrintSummary is part of the finally
of the upload results it didn't make sense to wrap it all.