diff options
| author | bustamante <bustamante@chromium.org> | 2015-03-18 11:53:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 18:53:57 +0000 |
| commit | b63511e942695914ce8926b0f8aa5c65d8645aa8 (patch) | |
| tree | 89eb9c7b4f1ae25f697de003ffa87a004f6109c0 /tools/chrome_proxy | |
| parent | f8a56aa27183fceb0489e686a663d980ff76f97f (diff) | |
| download | chromium_src-b63511e942695914ce8926b0f8aa5c65d8645aa8.zip chromium_src-b63511e942695914ce8926b0f8aa5c65d8645aa8.tar.gz chromium_src-b63511e942695914ce8926b0f8aa5c65d8645aa8.tar.bz2 | |
Disable SafeBrowsingOff test for Android
This test is designed to verify that safe browsing doesn't interfere on desktop and webview platforms, but shouldn't run for android where safe browsing is expected to work.
BUG=468087
Review URL: https://codereview.chromium.org/1003773003
Cr-Commit-Position: refs/heads/master@{#321179}
Diffstat (limited to 'tools/chrome_proxy')
| -rw-r--r-- | tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py index c54af10..c9961e7 100644 --- a/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py @@ -5,8 +5,13 @@ from integration_tests import chrome_proxy_measurements as measurements from integration_tests import chrome_proxy_pagesets as pagesets from telemetry import benchmark +from telemetry.core.backends.chrome import android_browser_finder +ANDROID_CHROME_BROWSERS = [ + browser for browser in android_browser_finder.CHROME_PACKAGE_NAMES + if 'webview' not in browser] + class ChromeProxyLatency(benchmark.Benchmark): tag = 'latency' test = measurements.ChromeProxyLatency @@ -149,7 +154,7 @@ class ChromeProxyBlockOnce(benchmark.Benchmark): return 'chrome_proxy_benchmark.block_once.block_once' -@benchmark.Enabled('android') +@benchmark.Enabled(*ANDROID_CHROME_BROWSERS) # Safebrowsing is enabled for Android and iOS. class ChromeProxySafeBrowsingOn(benchmark.Benchmark): tag = 'safebrowsing_on' @@ -161,6 +166,7 @@ class ChromeProxySafeBrowsingOn(benchmark.Benchmark): return 'chrome_proxy_benchmark.safebrowsing_on.safebrowsing' +@benchmark.Disabled(*ANDROID_CHROME_BROWSERS) # Safebrowsing is switched off for Android Webview and all desktop platforms. class ChromeProxySafeBrowsingOff(benchmark.Benchmark): tag = 'safebrowsing_off' |