Updating telemetry logic to return success when a disabled test is run.

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 266 matching lines @@
   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
     not decorators.IsBenchmarkEnabled(benchmark, possible_browser)):
-    logging.warning('%s is disabled on the selected browser', benchmark.Name())
+    print '%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')
+      print 'Running benchmark anyway due to: --also-run-disabled-tests'
     else:
-      logging.warning(
-          'Try --also-run-disabled-tests to force the benchmark to run.')
+      print '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.
+      # benchmark name and disabled state.
       with results_options.CreateResults(
           benchmark_metadata, finder_options,
           benchmark.ValueCanBeAddedPredicate, benchmark_enabled=False
           ) as results:
         results.PrintSummary()
-      return 1
+      # When a disabled benchmark is run we now want to return success since
+      # we are no longer filtering these out in the buildbot recipes.
+      return 0
 
   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
@@ skipping 116 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.')