-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# 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.
-import sys
-
-from telemetry import test
from measurements import page_cycler
+import page_sets
+from telemetry import benchmark
-class PageCyclerBloat(test.Test):
- test = page_cycler.PageCycler
- page_set = 'page_sets/page_cycler/bloat.json'
- options = {'pageset_repeat_iters': 10}
-
-
-class PageCyclerDhtml(test.Test):
+class PageCyclerBloat(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/page_cycler/dhtml.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.BloatPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIndexeddb(test.Test):
- tag = 'indexed_db'
+class PageCyclerDhtml(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/page_cycler/indexed_db/basic_insert.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.DhtmlPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIntlArFaHe(test.Test):
+class PageCyclerIntlArFaHe(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/intl_ar_fa_he.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.IntlArFaHePageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIntlEsFrPtBr(test.Test):
+@benchmark.Disabled('win') # crbug.com/388337
+class PageCyclerIntlEsFrPtBr(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/intl_es_fr_pt-BR.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.IntlEsFrPtBrPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIntlHiRu(test.Test):
+class PageCyclerIntlHiRu(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/intl_hi_ru.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.IntlHiRuPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIntlJaZh(test.Test):
+@benchmark.Disabled('android', 'win') # crbug.com/379564, crbug.com/330909
+class PageCyclerIntlJaZh(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/intl_ja_zh.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.IntlJaZhPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerIntlKoThVi(test.Test):
+class PageCyclerIntlKoThVi(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/intl_ko_th_vi.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.IntlKoThViPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerMorejs(test.Test):
+class PageCyclerMorejs(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/page_cycler/morejs.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.MorejsPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerMoz(test.Test):
+class PageCyclerMoz(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/page_cycler/moz.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.MozPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerNetsimTop10(test.Test):
+@benchmark.Disabled('linux', 'win') # crbug.com/353260
+class PageCyclerNetsimTop10(benchmark.Benchmark):
"""Measures load time of the top 10 sites under simulated cable network."""
tag = 'netsim'
test = page_cycler.PageCycler
- page_set = 'page_sets/top_10.json'
+ page_set = page_sets.Top10PageSet
options = {
- 'cold_load_percent': 100,
- 'extra_wpr_args': [
- '--shaping_type=proxy',
- '--net=cable'
+ 'cold_load_percent': 100,
+ 'extra_wpr_args': [
+ '--shaping_type=proxy',
+ '--net=cable'
],
- 'pageset_repeat_iters': 5,
- }
+ 'pageset_repeat': 5,
+ }
def __init__(self):
super(PageCyclerNetsimTop10, self).__init__()
self.test.clear_cache_before_each_run = True
-class PageCyclerTop10Mobile(test.Test):
+@benchmark.Enabled('android')
+class PageCyclerTop10Mobile(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/top_10_mobile.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.Top10MobilePageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerKeyMobileSites(test.Test):
+@benchmark.Disabled
+class PageCyclerKeyMobileSites(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/key_mobile_sites.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.KeyMobileSitesPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerToughLayoutCases(test.Test):
+@benchmark.Disabled('android') # crbug.com/357326
+class PageCyclerToughLayoutCases(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/tough_layout_cases.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.ToughLayoutCasesPageSet
+ options = {'pageset_repeat': 10}
-class PageCyclerTypical25(test.Test):
- # crbug.com/273986: This test is really flakey on xp.
- enabled = not sys.platform.startswith('win')
+# crbug.com/273986: This test is really flakey on xp.
+# cabug.com/341843: This test is always timing out on Android.
+@benchmark.Disabled('android', 'win')
+class PageCyclerTypical25(benchmark.Benchmark):
test = page_cycler.PageCycler
- page_set = 'page_sets/typical_25.json'
- options = {'pageset_repeat_iters': 10}
+ page_set = page_sets.Typical25PageSet
+ options = {'pageset_repeat': 10}