[Telemetry] Let --also-run-disabled-tests override StoryExpectations.DisableBenchmark

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 @@
     print ('Cannot find browser of type %s. To list out all '
            'available browsers, rerun your command with '
            '--browser=list' %  finder_options.browser_options.browser_type)
     return 1
 
   can_run_on_platform = benchmark._CanRunOnPlatform(possible_browser.platform,
                                                     finder_options)
 
   # TODO(rnephew): Remove decorators.IsBenchmarkEnabled and IsBenchmarkDisabled
   # when we have fully moved to _CanRunOnPlatform().
-  permanently_disabled = expectations.IsBenchmarkDisabled(
+  expectations_disabled = expectations.IsBenchmarkDisabled(
       possible_browser.platform, finder_options)
   temporarily_disabled = not decorators.IsBenchmarkEnabled(

[nednguyen, 2017/09/25 18:06:35]

unrelated but are we ready to get rid of this?

       benchmark, possible_browser)
 
-  if permanently_disabled or temporarily_disabled or not can_run_on_platform:
+  if expectations_disabled or temporarily_disabled or not can_run_on_platform:
     print '%s is disabled on the selected browser' % benchmark.Name()
-    if finder_options.run_disabled_tests and not permanently_disabled:
+    if finder_options.run_disabled_tests and can_run_on_platform:
       print 'Running benchmark anyway due to: --also-run-disabled-tests'
     else:
       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.
       with results_options.CreateResults(
           benchmark_metadata, finder_options,
           benchmark.ValueCanBeAddedPredicate, benchmark_enabled=False
           ) as results:
         results.PrintSummary()
@@ skipping 155 matching lines @@
       reserved_infos.OS_VERSIONS.name: state.platform.GetOSVersionName(),
   }
 
   device_info_diangostics = {}
 
   for name, value in device_info_data.iteritems():
     if not value:
       continue
     device_info_diangostics[name] = histogram.GenericSet([value])
   return device_info_diangostics