diff options
| -rw-r--r-- | tools/perf/benchmarks/benchmark_unittest.py | 13 | ||||
| -rw-r--r-- | tools/perf/benchmarks/thread_times.py | 2 | ||||
| -rw-r--r-- | tools/perf/page_sets/simple_mobile_sites.py | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py index e2cfad7..38c957c 100644 --- a/tools/perf/benchmarks/benchmark_unittest.py +++ b/tools/perf/benchmarks/benchmark_unittest.py @@ -19,12 +19,13 @@ from telemetry.unittest import progress_reporter def SmokeTestGenerator(benchmark): - # In general you should @benchmark_module.Disabled individual benchmarks that - # fail, instead of this entire smoke test suite. - # TODO(achuith): Multiple tests failing on CrOS. crbug.com/351114 - @benchmark_module.Disabled('chromeos') - # Flaky, http://crbug.com/400747 . - @benchmark_module.Disabled('mac') + # NOTE TO SHERIFFS: DO NOT DISABLE THIS TEST. + # + # This smoke test dynamically tests all benchmarks. So disabling it for one + # failing or flaky benchmark would disable a much wider swath of coverage + # than is usally intended. Instead, if a particular benchmark is failing, + # disable it in tools/perf/benchmarks/*. + @benchmark_module.Disabled('chromeos') # crbug.com/351114 def BenchmarkSmokeTest(self): # Only measure a single page so that this test cycles reasonably quickly. benchmark.options['pageset_repeat'] = 1 diff --git a/tools/perf/benchmarks/thread_times.py b/tools/perf/benchmarks/thread_times.py index 055f1fb..7de578b 100644 --- a/tools/perf/benchmarks/thread_times.py +++ b/tools/perf/benchmarks/thread_times.py @@ -43,6 +43,8 @@ class ThreadTimesFastPathMobileSites(benchmark.Benchmark): page_set = page_sets.KeyMobileSitesPageSet options = {'page_label_filter' : 'fastpath'} + +@benchmark.Disabled # crbug.com/400922 class ThreadTimesSimpleMobileSites(benchmark.Benchmark): """Measures timeline metric using smoothness action on simple mobile sites http://www.chromium.org/developers/design-documents/rendering-benchmarks""" diff --git a/tools/perf/page_sets/simple_mobile_sites.py b/tools/perf/page_sets/simple_mobile_sites.py index ad717e4..e072df4 100644 --- a/tools/perf/page_sets/simple_mobile_sites.py +++ b/tools/perf/page_sets/simple_mobile_sites.py @@ -11,7 +11,6 @@ class SimplePage(page_module.Page): super(SimplePage, self).__init__(url=url, page_set=page_set) self.credentials_path = 'data/credentials.json' self.archive_data_file = 'data/simple_mobile_sites.json' - self.disabled = 'Times out on Windows; crbug.com/400922' def RunNavigateSteps(self, action_runner): action_runner.NavigateToPage(self) |