| Index: tools/perf/benchmarks/startup.py
|
| diff --git a/tools/perf/benchmarks/startup.py b/tools/perf/benchmarks/startup.py
|
| index 5c80987b6e98d0342847a068772656673346affa..c8372fc10d85e14c16e81b67cbecfb37efa01ac0 100644
|
| --- a/tools/perf/benchmarks/startup.py
|
| +++ b/tools/perf/benchmarks/startup.py
|
| @@ -1,14 +1,14 @@
|
| # Copyright 2013 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.
|
| -from telemetry import test
|
| +from telemetry import benchmark
|
|
|
| from measurements import startup
|
| import page_sets
|
|
|
|
|
| -@test.Disabled('snowleopard') # crbug.com/336913
|
| -class StartupColdBlankPage(test.Test):
|
| +@benchmark.Disabled('snowleopard') # crbug.com/336913
|
| +class StartupColdBlankPage(benchmark.Benchmark):
|
| tag = 'cold'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
| @@ -16,15 +16,15 @@ class StartupColdBlankPage(test.Test):
|
| 'pageset_repeat': 5}
|
|
|
|
|
| -class StartupWarmBlankPage(test.Test):
|
| +class StartupWarmBlankPage(benchmark.Benchmark):
|
| tag = 'warm'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
| options = {'warm': True,
|
| 'pageset_repeat': 20}
|
|
|
| -@test.Disabled('snowleopard') # crbug.com/336913
|
| -class StartupColdTheme(test.Test):
|
| +@benchmark.Disabled('snowleopard') # crbug.com/336913
|
| +class StartupColdTheme(benchmark.Benchmark):
|
| tag = 'theme_cold'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
| @@ -33,7 +33,7 @@ class StartupColdTheme(test.Test):
|
| 'pageset_repeat': 5}
|
|
|
|
|
| -class StartupWarmTheme(test.Test):
|
| +class StartupWarmTheme(benchmark.Benchmark):
|
| tag = 'theme_warm'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
| @@ -41,8 +41,8 @@ class StartupWarmTheme(test.Test):
|
| options = {'warm': True,
|
| 'pageset_repeat': 20}
|
|
|
| -@test.Disabled('snowleopard') # crbug.com/336913
|
| -class StartupColdManyExtensions(test.Test):
|
| +@benchmark.Disabled('snowleopard') # crbug.com/336913
|
| +class StartupColdManyExtensions(benchmark.Benchmark):
|
| tag = 'many_extensions_cold'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
| @@ -51,7 +51,7 @@ class StartupColdManyExtensions(test.Test):
|
| 'pageset_repeat': 5}
|
|
|
|
|
| -class StartupWarmManyExtensions(test.Test):
|
| +class StartupWarmManyExtensions(benchmark.Benchmark):
|
| tag = 'many_extensions_warm'
|
| test = startup.Startup
|
| page_set = page_sets.BlankPageSet
|
|
|