| 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 import base64 | 5 import base64 |
| 6 import logging | 6 import logging |
| 7 import urlparse | 7 import urlparse |
| 8 | 8 |
| 9 from integration_tests import chrome_proxy_metrics as metrics | 9 from integration_tests import chrome_proxy_metrics as metrics |
| 10 from metrics import loading | 10 from metrics import loading |
| 11 from telemetry.core import exceptions | 11 from telemetry.core import exceptions |
| 12 from telemetry.page import page_test | 12 from telemetry.page import page_test |
| 13 | 13 |
| 14 | 14 |
| 15 class ChromeProxyLatency(page_test.PageTest): | 15 class ChromeProxyLatency(page_test.PageTest): |
| 16 """Chrome proxy latency measurement.""" | 16 """Chrome proxy latency measurement.""" |
| 17 | 17 |
| 18 def __init__(self, *args, **kwargs): | 18 def __init__(self, *args, **kwargs): |
| 19 super(ChromeProxyLatency, self).__init__(*args, **kwargs) | 19 super(ChromeProxyLatency, self).__init__(*args, **kwargs) |
| 20 | 20 |
| 21 def CustomizeBrowserOptions(self, options): |
| 22 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') |
| 23 |
| 21 def WillNavigateToPage(self, page, tab): | 24 def WillNavigateToPage(self, page, tab): |
| 22 tab.ClearCache(force=True) | 25 tab.ClearCache(force=True) |
| 23 | 26 |
| 24 def ValidateAndMeasurePage(self, page, tab, results): | 27 def ValidateAndMeasurePage(self, page, tab, results): |
| 25 # Wait for the load event. | 28 # Wait for the load event. |
| 26 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) | 29 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) |
| 27 loading.LoadingMetric().AddResults(tab, results) | 30 loading.LoadingMetric().AddResults(tab, results) |
| 28 | 31 |
| 29 | 32 |
| 30 class ChromeProxyDataSaving(page_test.PageTest): | 33 class ChromeProxyDataSaving(page_test.PageTest): |
| 31 """Chrome proxy data daving measurement.""" | 34 """Chrome proxy data saving measurement.""" |
| 32 def __init__(self, *args, **kwargs): | 35 def __init__(self, *args, **kwargs): |
| 33 super(ChromeProxyDataSaving, self).__init__(*args, **kwargs) | 36 super(ChromeProxyDataSaving, self).__init__(*args, **kwargs) |
| 34 self._metrics = metrics.ChromeProxyMetric() | 37 self._metrics = metrics.ChromeProxyMetric() |
| 35 | 38 |
| 39 def CustomizeBrowserOptions(self, options): |
| 40 options.AppendExtraBrowserArgs('--enable-spdy-proxy-auth') |
| 41 |
| 36 def WillNavigateToPage(self, page, tab): | 42 def WillNavigateToPage(self, page, tab): |
| 37 tab.ClearCache(force=True) | 43 tab.ClearCache(force=True) |
| 38 self._metrics.Start(page, tab) | 44 self._metrics.Start(page, tab) |
| 39 | 45 |
| 40 def ValidateAndMeasurePage(self, page, tab, results): | 46 def ValidateAndMeasurePage(self, page, tab, results): |
| 41 # Wait for the load event. | 47 # Wait for the load event. |
| 42 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) | 48 tab.WaitForJavaScriptExpression('performance.timing.loadEventStart', 300) |
| 43 self._metrics.Stop(page, tab) | 49 self._metrics.Stop(page, tab) |
| 44 self._metrics.AddResultsForDataSaving(tab, results) | 50 self._metrics.AddResultsForDataSaving(tab, results) |
| 45 | 51 |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 client_type = self._metrics.GetClientTypeFromRequests(tab) | 286 client_type = self._metrics.GetClientTypeFromRequests(tab) |
| 281 if client_type: | 287 if client_type: |
| 282 self._chrome_proxy_client_type = client_type | 288 self._chrome_proxy_client_type = client_type |
| 283 | 289 |
| 284 self._metrics.AddResultsForClientType(tab, | 290 self._metrics.AddResultsForClientType(tab, |
| 285 results, | 291 results, |
| 286 self._chrome_proxy_client_type, | 292 self._chrome_proxy_client_type, |
| 287 self._page.bypass_for_client_type) | 293 self._page.bypass_for_client_type) |
| 288 | 294 |
| 289 | 295 |
| 296 class ChromeProxyLoFi(ChromeProxyValidation): |
| 297 """Correctness measurement for Lo-Fi in Chrome-Proxy header.""" |
| 298 |
| 299 def __init__(self): |
| 300 super(ChromeProxyLoFi, self).__init__(restart_after_each_page=True) |
| 301 |
| 302 def CustomizeBrowserOptions(self, options): |
| 303 super(ChromeProxyLoFi, self).CustomizeBrowserOptions(options) |
| 304 options.AppendExtraBrowserArgs('--enable-data-reduction-proxy-lo-fi') |
| 305 |
| 306 def AddResults(self, tab, results): |
| 307 self._metrics.AddResultsForLoFi(tab, results) |
| 308 |
| 309 |
| 290 class ChromeProxyHTTPToDirectFallback(ChromeProxyValidation): | 310 class ChromeProxyHTTPToDirectFallback(ChromeProxyValidation): |
| 291 """Correctness measurement for HTTP proxy fallback to direct.""" | 311 """Correctness measurement for HTTP proxy fallback to direct.""" |
| 292 | 312 |
| 293 def __init__(self): | 313 def __init__(self): |
| 294 super(ChromeProxyHTTPToDirectFallback, self).__init__( | 314 super(ChromeProxyHTTPToDirectFallback, self).__init__( |
| 295 restart_after_each_page=True) | 315 restart_after_each_page=True) |
| 296 | 316 |
| 297 def CustomizeBrowserOptions(self, options): | 317 def CustomizeBrowserOptions(self, options): |
| 298 super(ChromeProxyHTTPToDirectFallback, | 318 super(ChromeProxyHTTPToDirectFallback, |
| 299 self).CustomizeBrowserOptions(options) | 319 self).CustomizeBrowserOptions(options) |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 self._metrics.AddResultsForDataSaving, | 378 self._metrics.AddResultsForDataSaving, |
| 359 ], | 379 ], |
| 360 'bypass': [self._metrics.AddResultsForBypass], | 380 'bypass': [self._metrics.AddResultsForBypass], |
| 361 } | 381 } |
| 362 if not self._page.name in page_to_metrics: | 382 if not self._page.name in page_to_metrics: |
| 363 raise page_test.MeasurementFailure( | 383 raise page_test.MeasurementFailure( |
| 364 'Invalid page name (%s) in smoke. Page name must be one of:\n%s' % ( | 384 'Invalid page name (%s) in smoke. Page name must be one of:\n%s' % ( |
| 365 self._page.name, page_to_metrics.keys())) | 385 self._page.name, page_to_metrics.keys())) |
| 366 for add_result in page_to_metrics[self._page.name]: | 386 for add_result in page_to_metrics[self._page.name]: |
| 367 add_result(tab, results) | 387 add_result(tab, results) |
| OLD | NEW |