OLD | NEW |
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 |
6 from measurements import chrome_proxy | 7 from measurements import chrome_proxy |
7 from page_sets.chrome_proxy import bypass | 8 import page_sets |
8 from page_sets.chrome_proxy import fallback_viaheader | 9 |
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 | |
13 | 10 |
14 class ChromeProxyLatency(test.Test): | 11 class ChromeProxyLatency(test.Test): |
15 tag = 'latency' | 12 tag = 'latency' |
16 test = chrome_proxy.ChromeProxyLatency | 13 test = chrome_proxy.ChromeProxyLatency |
17 page_set = top_20.Top20PageSet() | 14 page_set = page_sets.Top20PageSet |
18 options = {'pageset_repeat_iters': 2} | 15 options = {'pageset_repeat_iters': 2} |
19 | 16 |
20 def CustomizeBrowserOptions(self, options): | 17 def CustomizeBrowserOptions(self, options): |
21 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') | 18 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') |
22 | 19 |
23 | 20 |
24 class ChromeProxyLatencyDirect(test.Test): | 21 class ChromeProxyLatencyDirect(test.Test): |
25 tag = 'latency_direct' | 22 tag = 'latency_direct' |
26 test = chrome_proxy.ChromeProxyLatency | 23 test = chrome_proxy.ChromeProxyLatency |
27 page_set = top_20.Top20PageSet() | 24 page_set = page_sets.Top20PageSet |
28 options = {'pageset_repeat_iters': 2} | 25 options = {'pageset_repeat_iters': 2} |
29 | 26 |
30 | 27 |
31 class ChromeProxyLatencySynthetic(ChromeProxyLatency): | 28 class ChromeProxyLatencySynthetic(ChromeProxyLatency): |
32 page_set = synthetic.SyntheticPageSet() | 29 page_set = page_sets.SyntheticPageSet |
33 | 30 |
34 | 31 |
35 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect): | 32 class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect): |
36 page_set = synthetic.SyntheticPageSet() | 33 page_set = page_sets.SyntheticPageSet |
37 | 34 |
38 | 35 |
39 class ChromeProxyDataSaving(test.Test): | 36 class ChromeProxyDataSaving(test.Test): |
40 tag = 'data_saving' | 37 tag = 'data_saving' |
41 test = chrome_proxy.ChromeProxyDataSaving | 38 test = chrome_proxy.ChromeProxyDataSaving |
42 page_set = top_20.Top20PageSet() | 39 page_set = page_sets.Top20PageSet |
43 options = {'pageset_repeat_iters': 1} | 40 options = {'pageset_repeat_iters': 1} |
44 def CustomizeBrowserOptions(self, options): | 41 def CustomizeBrowserOptions(self, options): |
45 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') | 42 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') |
46 | 43 |
47 | 44 |
48 class ChromeProxyDataSavingDirect(test.Test): | 45 class ChromeProxyDataSavingDirect(test.Test): |
49 tag = 'data_saving_direct' | 46 tag = 'data_saving_direct' |
50 test = chrome_proxy.ChromeProxyDataSaving | 47 test = chrome_proxy.ChromeProxyDataSaving |
| 48 page_set = page_sets.Top20PageSet |
51 options = {'pageset_repeat_iters': 2} | 49 options = {'pageset_repeat_iters': 2} |
52 page_set = top_20.Top20PageSet() | |
53 | 50 |
54 | 51 |
55 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving): | 52 class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving): |
56 page_set = synthetic.SyntheticPageSet() | 53 page_set = page_sets.SyntheticPageSet |
57 | 54 |
58 | 55 |
59 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect): | 56 class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect): |
60 page_set = synthetic.SyntheticPageSet() | 57 page_set = page_sets.SyntheticPageSet |
61 | 58 |
62 | 59 |
63 class ChromeProxyHeaderValidation(test.Test): | 60 class ChromeProxyHeaderValidation(test.Test): |
64 tag = 'header_validation' | 61 tag = 'header_validation' |
65 test = chrome_proxy.ChromeProxyHeaders | 62 test = chrome_proxy.ChromeProxyHeaders |
66 page_set = top_20.Top20PageSet() | 63 page_set = page_sets.Top20PageSet |
67 | 64 |
68 | 65 |
69 class ChromeProxyBypass(test.Test): | 66 class ChromeProxyBypass(test.Test): |
70 tag = 'bypass' | 67 tag = 'bypass' |
71 test = chrome_proxy.ChromeProxyBypass | 68 test = chrome_proxy.ChromeProxyBypass |
72 page_set = bypass.BypassPageSet() | 69 page_set = page_sets.BypassPageSet |
73 | 70 |
74 | 71 |
75 class ChromeProxySafeBrowsing(test.Test): | 72 class ChromeProxySafeBrowsing(test.Test): |
76 tag = 'safebrowsing' | 73 tag = 'safebrowsing' |
77 test = chrome_proxy.ChromeProxySafebrowsing | 74 test = chrome_proxy.ChromeProxySafebrowsing |
78 page_set = safebrowsing.SafebrowsingPageSet() | 75 page_set = page_sets.SafebrowsingPageSet |
79 | 76 |
80 | 77 |
81 class ChromeProxyHTTPFallbackProbeURL(test.Test): | 78 class ChromeProxyHTTPFallbackProbeURL(test.Test): |
82 tag = 'fallback-probe' | 79 tag = 'fallback-probe' |
83 test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL | 80 test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL |
84 page_set = synthetic.SyntheticPageSet() | 81 page_set = page_sets.SyntheticPageSet |
85 | 82 |
86 | 83 |
87 class ChromeProxyHTTPFallbackViaHeader(test.Test): | 84 class ChromeProxyHTTPFallbackViaHeader(test.Test): |
88 tag = 'fallback-viaheader' | 85 tag = 'fallback-viaheader' |
89 test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader | 86 test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader |
90 page_set = fallback_viaheader.FallbackViaHeaderPageSet() | 87 page_set = page_sets.FallbackViaHeaderPageSet |
91 | 88 |
92 | 89 |
93 class ChromeProxySmoke(test.Test): | 90 class ChromeProxySmoke(test.Test): |
94 tag = 'smoke' | 91 tag = 'smoke' |
95 test = chrome_proxy.ChromeProxySmoke | 92 test = chrome_proxy.ChromeProxySmoke |
96 page_set = smoke.SmokePageSet() | 93 page_set = page_sets.SmokePageSet |
OLD | NEW |