Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Side by Side Diff: tools/perf/benchmarks/chrome_proxy.py

Issue 315083002: Convert page_set in chrome_proxy benchmarks to use the actual page_set objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 from telemetry import test 5 from telemetry import test
6 from measurements import chrome_proxy 6 from measurements import chrome_proxy
7 7 from page_sets.chrome_proxy import bypass
8 from page_sets.chrome_proxy import fallback_viaheader
9 from page_sets.chrome_proxy import safebrowsing
10 from page_sets.chrome_proxy import smoke
11 from page_sets.chrome_proxy import synthetic
12 from page_sets.chrome_proxy import top_20
8 13
9 class ChromeProxyLatency(test.Test): 14 class ChromeProxyLatency(test.Test):
10 tag = 'latency' 15 tag = 'latency'
11 test = chrome_proxy.ChromeProxyLatency 16 test = chrome_proxy.ChromeProxyLatency
12 page_set = 'page_sets/chrome_proxy/top_20.py' 17 page_set = top_20.Top20PageSet()
13 options = {'pageset_repeat_iters': 2} 18 options = {'pageset_repeat_iters': 2}
14 19
15 def CustomizeBrowserOptions(self, options): 20 def CustomizeBrowserOptions(self, options):
16 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') 21 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
17 22
18 23
19 class ChromeProxyLatencyDirect(test.Test): 24 class ChromeProxyLatencyDirect(test.Test):
20 tag = 'latency_direct' 25 tag = 'latency_direct'
21 test = chrome_proxy.ChromeProxyLatency 26 test = chrome_proxy.ChromeProxyLatency
22 page_set = 'page_sets/chrome_proxy/top_20.py' 27 page_set = top_20.Top20PageSet()
23 options = {'pageset_repeat_iters': 2} 28 options = {'pageset_repeat_iters': 2}
24 29
25 30
26 class ChromeProxyLatencySynthetic(ChromeProxyLatency): 31 class ChromeProxyLatencySynthetic(ChromeProxyLatency):
27 page_set = 'page_sets/chrome_proxy/synthetic.py' 32 page_set = synthetic.SyntheticPageSet()
28 33
29 34
30 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect): 35 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
31 page_set = 'page_sets/chrome_proxy/synthetic.py' 36 page_set = synthetic.SyntheticPageSet()
32 37
33 38
34 class ChromeProxyDataSaving(test.Test): 39 class ChromeProxyDataSaving(test.Test):
35 tag = 'data_saving' 40 tag = 'data_saving'
36 test = chrome_proxy.ChromeProxyDataSaving 41 test = chrome_proxy.ChromeProxyDataSaving
37 page_set = 'page_sets/chrome_proxy/top_20.py' 42 page_set = top_20.Top20PageSet()
38 options = {'pageset_repeat_iters': 1} 43 options = {'pageset_repeat_iters': 1}
39 def CustomizeBrowserOptions(self, options): 44 def CustomizeBrowserOptions(self, options):
40 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') 45 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
41 46
42 47
43 class ChromeProxyDataSavingDirect(test.Test): 48 class ChromeProxyDataSavingDirect(test.Test):
44 tag = 'data_saving_direct' 49 tag = 'data_saving_direct'
45 test = chrome_proxy.ChromeProxyDataSaving 50 test = chrome_proxy.ChromeProxyDataSaving
46 options = {'pageset_repeat_iters': 2} 51 options = {'pageset_repeat_iters': 2}
47 page_set = 'page_sets/chrome_proxy/top_20.py' 52 page_set = top_20.Top20PageSet()
48 53
49 54
50 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving): 55 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
51 page_set = 'page_sets/chrome_proxy/synthetic.py' 56 page_set = synthetic.SyntheticPageSet()
52 57
53 58
54 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect): 59 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
55 page_set = 'page_sets/chrome_proxy/synthetic.py' 60 page_set = synthetic.SyntheticPageSet()
56 61
57 62
58 class ChromeProxyHeaderValidation(test.Test): 63 class ChromeProxyHeaderValidation(test.Test):
59 tag = 'header_validation' 64 tag = 'header_validation'
60 test = chrome_proxy.ChromeProxyHeaders 65 test = chrome_proxy.ChromeProxyHeaders
61 page_set = 'page_sets/chrome_proxy/top_20.py' 66 page_set = top_20.Top20PageSet()
62 67
63 68
64 class ChromeProxyBypass(test.Test): 69 class ChromeProxyBypass(test.Test):
65 tag = 'bypass' 70 tag = 'bypass'
66 test = chrome_proxy.ChromeProxyBypass 71 test = chrome_proxy.ChromeProxyBypass
67 page_set = 'page_sets/chrome_proxy/bypass.py' 72 page_set = bypass.BypassPageSet()
68 73
69 74
70 class ChromeProxySafeBrowsing(test.Test): 75 class ChromeProxySafeBrowsing(test.Test):
71 tag = 'safebrowsing' 76 tag = 'safebrowsing'
72 test = chrome_proxy.ChromeProxySafebrowsing 77 test = chrome_proxy.ChromeProxySafebrowsing
73 page_set = 'page_sets/chrome_proxy/safebrowsing.py' 78 page_set = safebrowsing.SafebrowsingPageSet()
74 79
75 80
76 class ChromeProxyHTTPFallbackProbeURL(test.Test): 81 class ChromeProxyHTTPFallbackProbeURL(test.Test):
77 tag = 'fallback-probe' 82 tag = 'fallback-probe'
78 test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL 83 test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
79 page_set = 'page_sets/chrome_proxy/synthetic.py' 84 page_set = synthetic.SyntheticPageSet()
80 85
81 86
82 class ChromeProxyHTTPFallbackViaHeader(test.Test): 87 class ChromeProxyHTTPFallbackViaHeader(test.Test):
83 tag = 'fallback-viaheader' 88 tag = 'fallback-viaheader'
84 test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader 89 test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
85 page_set = 'page_sets/chrome_proxy/fallback_viaheader.py' 90 page_set = fallback_viaheader.FallbackViaHeaderPageSet()
86 91
87 92
88 class ChromeProxySmoke(test.Test): 93 class ChromeProxySmoke(test.Test):
89 tag = 'smoke' 94 tag = 'smoke'
90 test = chrome_proxy.ChromeProxySmoke 95 test = chrome_proxy.ChromeProxySmoke
91 page_set = 'page_sets/chrome_proxy/smoke.py' 96 page_set = smoke.SmokePageSet()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698