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

telemetry/telemetry/internal/story_runner_unittest.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 json
 import math
 import os
 import shutil
 import StringIO
 import sys
@@ skipping 1250 matching lines @@
     tmp_path = tempfile.mkdtemp()
     try:
       options.output_dir = tmp_path
       story_runner.RunBenchmark(fake_benchmark, options)
       with open(os.path.join(tmp_path, 'results-chart.json')) as f:
         data = json.load(f)
       self.assertFalse(data['enabled'])
     finally:
       shutil.rmtree(tmp_path)
 
-  # TODO(rnephew): Refactor this test when we no longer use
-  # expectations.PermanentlyDisableBenchmark() to disable benchmarks.
   def testRunBenchmarkDisabledBenchmark(self):
     fake_benchmark = FakeBenchmark()
     fake_benchmark.disabled = True
     options = self._GenerateBaseBrowserFinderOptions()
     tmp_path = tempfile.mkdtemp()
     try:
       options.output_dir = tmp_path
       story_runner.RunBenchmark(fake_benchmark, options)
       with open(os.path.join(tmp_path, 'results-chart.json')) as f:
         data = json.load(f)
       self.assertFalse(data['enabled'])
     finally:
       shutil.rmtree(tmp_path)
 
-  # TODO(rnephew): Refactor this test when we no longer use
-  # expectations.PermanentlyDisableBenchmark() to disable benchmarks.
-  def testRunBenchmarkDisabledBenchmarkCannotOverriddenByCommandLine(self):
+  def testRunBenchmarkDisabledBenchmarkCanOverriddenByCommandLine(self):
     fake_benchmark = FakeBenchmark()
     fake_benchmark.disabled = True
     options = self._GenerateBaseBrowserFinderOptions()
     options.run_disabled_tests = True
     temp_path = tempfile.mkdtemp()
     try:
       options.output_dir = temp_path
       story_runner.RunBenchmark(fake_benchmark, options)
       with open(os.path.join(temp_path, 'results-chart.json')) as f:
         data = json.load(f)
-      self.assertFalse(data['enabled'])
+      self.assertTrue(data['enabled'])
     finally:
       shutil.rmtree(temp_path)
 
   def testRunBenchmark_AddsOwners_NoComponent(self):
     @benchmark.Owner(emails=['alice@chromium.org'])
     class FakeBenchmarkWithOwner(FakeBenchmark):
       def __init__(self):
         super(FakeBenchmark, self).__init__()
         self._disabled = False
         self._story_disabled = False
@@ skipping 94 matching lines @@
     fake_benchmark.story_disabled = True
     options = self._GenerateBaseBrowserFinderOptions()
     tmp_path = tempfile.mkdtemp()
     try:
       options.output_dir = tmp_path
       rc = story_runner.RunBenchmark(fake_benchmark, options)
       # Test should return 0 since only error messages are logged.
       self.assertEqual(rc, 0)
     finally:
       shutil.rmtree(tmp_path)