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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/benchmarks/chrome_proxy.py
diff --git a/tools/perf/benchmarks/chrome_proxy.py b/tools/perf/benchmarks/chrome_proxy.py
index 5c58709946f795fba02ac1372d5b92e9a8a04159..4414d24a970ccf9e0adf1bb60dcb39c242752406 100644
--- a/tools/perf/benchmarks/chrome_proxy.py
+++ b/tools/perf/benchmarks/chrome_proxy.py
@@ -4,12 +4,17 @@
from telemetry import test
from measurements import chrome_proxy
-
+from page_sets.chrome_proxy import bypass
+from page_sets.chrome_proxy import fallback_viaheader
+from page_sets.chrome_proxy import safebrowsing
+from page_sets.chrome_proxy import smoke
+from page_sets.chrome_proxy import synthetic
+from page_sets.chrome_proxy import top_20
class ChromeProxyLatency(test.Test):
tag = 'latency'
test = chrome_proxy.ChromeProxyLatency
- page_set = 'page_sets/chrome_proxy/top_20.py'
+ page_set = top_20.Top20PageSet()
options = {'pageset_repeat_iters': 2}
def CustomizeBrowserOptions(self, options):
@@ -19,22 +24,22 @@ class ChromeProxyLatency(test.Test):
class ChromeProxyLatencyDirect(test.Test):
tag = 'latency_direct'
test = chrome_proxy.ChromeProxyLatency
- page_set = 'page_sets/chrome_proxy/top_20.py'
+ page_set = top_20.Top20PageSet()
options = {'pageset_repeat_iters': 2}
class ChromeProxyLatencySynthetic(ChromeProxyLatency):
- page_set = 'page_sets/chrome_proxy/synthetic.py'
+ page_set = synthetic.SyntheticPageSet()
class ChromeProxyLatencySyntheticDirect(ChromeProxyLatencyDirect):
- page_set = 'page_sets/chrome_proxy/synthetic.py'
+ page_set = synthetic.SyntheticPageSet()
class ChromeProxyDataSaving(test.Test):
tag = 'data_saving'
test = chrome_proxy.ChromeProxyDataSaving
- page_set = 'page_sets/chrome_proxy/top_20.py'
+ page_set = top_20.Top20PageSet()
options = {'pageset_repeat_iters': 1}
def CustomizeBrowserOptions(self, options):
options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth')
@@ -44,48 +49,48 @@ class ChromeProxyDataSavingDirect(test.Test):
tag = 'data_saving_direct'
test = chrome_proxy.ChromeProxyDataSaving
options = {'pageset_repeat_iters': 2}
- page_set = 'page_sets/chrome_proxy/top_20.py'
+ page_set = top_20.Top20PageSet()
class ChromeProxyDataSavingSynthetic(ChromeProxyDataSaving):
- page_set = 'page_sets/chrome_proxy/synthetic.py'
+ page_set = synthetic.SyntheticPageSet()
class ChromeProxyDataSavingSyntheticDirect(ChromeProxyDataSavingDirect):
- page_set = 'page_sets/chrome_proxy/synthetic.py'
+ page_set = synthetic.SyntheticPageSet()
class ChromeProxyHeaderValidation(test.Test):
tag = 'header_validation'
test = chrome_proxy.ChromeProxyHeaders
- page_set = 'page_sets/chrome_proxy/top_20.py'
+ page_set = top_20.Top20PageSet()
class ChromeProxyBypass(test.Test):
tag = 'bypass'
test = chrome_proxy.ChromeProxyBypass
- page_set = 'page_sets/chrome_proxy/bypass.py'
+ page_set = bypass.BypassPageSet()
class ChromeProxySafeBrowsing(test.Test):
tag = 'safebrowsing'
test = chrome_proxy.ChromeProxySafebrowsing
- page_set = 'page_sets/chrome_proxy/safebrowsing.py'
+ page_set = safebrowsing.SafebrowsingPageSet()
class ChromeProxyHTTPFallbackProbeURL(test.Test):
tag = 'fallback-probe'
test = chrome_proxy.ChromeProxyHTTPFallbackProbeURL
- page_set = 'page_sets/chrome_proxy/synthetic.py'
+ page_set = synthetic.SyntheticPageSet()
class ChromeProxyHTTPFallbackViaHeader(test.Test):
tag = 'fallback-viaheader'
test = chrome_proxy.ChromeProxyHTTPFallbackViaHeader
- page_set = 'page_sets/chrome_proxy/fallback_viaheader.py'
+ page_set = fallback_viaheader.FallbackViaHeaderPageSet()
class ChromeProxySmoke(test.Test):
tag = 'smoke'
test = chrome_proxy.ChromeProxySmoke
- page_set = 'page_sets/chrome_proxy/smoke.py'
+ page_set = smoke.SmokePageSet()
« 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