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

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 ab8beb33ff420803b47b65ca8f504cefeff5d910..b8273622153d8235bdf3a61254a4f729eb59abb6 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -284,14 +284,14 @@ def RunBenchmark(benchmark, 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.'