| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 | 7 |
| 8 from telemetry.core import exceptions | 8 from telemetry.core import exceptions |
| 9 from telemetry.core import util | 9 from telemetry.core import util |
| 10 from telemetry import decorators | 10 from telemetry import decorators |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 # Allow devtools to connect to chrome. | 70 # Allow devtools to connect to chrome. |
| 71 '--remote-debugging-port=%i' % self._remote_debugging_port, | 71 '--remote-debugging-port=%i' % self._remote_debugging_port, |
| 72 # Open a maximized window. | 72 # Open a maximized window. |
| 73 '--start-maximized', | 73 '--start-maximized', |
| 74 # Disable system startup sound. | 74 # Disable system startup sound. |
| 75 '--ash-disable-system-sounds', | 75 '--ash-disable-system-sounds', |
| 76 # Ignore DMServer errors for policy fetches. | 76 # Ignore DMServer errors for policy fetches. |
| 77 '--allow-failed-policy-fetch-for-test', | 77 '--allow-failed-policy-fetch-for-test', |
| 78 # Skip user image selection screen, and post login screens. | 78 # Skip user image selection screen, and post login screens. |
| 79 '--oobe-skip-postlogin', | 79 '--oobe-skip-postlogin', |
| 80 # Disable chrome logging redirect. crbug.com/724273. |
| 81 '--disable-logging-redirect', |
| 80 # Debug logging. | 82 # Debug logging. |
| 81 vmodule]) | 83 vmodule]) |
| 82 | 84 |
| 83 # Disable GAIA services unless we're using GAIA login, or if there's an | 85 # Disable GAIA services unless we're using GAIA login, or if there's an |
| 84 # explicit request for it. | 86 # explicit request for it. |
| 85 if (self.browser_options.disable_gaia_services and | 87 if (self.browser_options.disable_gaia_services and |
| 86 not self.browser_options.gaia_login): | 88 not self.browser_options.gaia_login): |
| 87 args.append('--disable-gaia-services') | 89 args.append('--disable-gaia-services') |
| 88 | 90 |
| 89 trace_config_file = (self.platform_backend.tracing_controller_backend | 91 trace_config_file = (self.platform_backend.tracing_controller_backend |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 self._WaitForBrowserToComeUp() | 270 self._WaitForBrowserToComeUp() |
| 269 | 271 |
| 270 # Wait for extensions to load. | 272 # Wait for extensions to load. |
| 271 if self._supports_extensions: | 273 if self._supports_extensions: |
| 272 self._WaitForExtensionsToLoad() | 274 self._WaitForExtensionsToLoad() |
| 273 | 275 |
| 274 def _RaiseOnLoginFailure(self, error): | 276 def _RaiseOnLoginFailure(self, error): |
| 275 if self._platform_backend.CanTakeScreenshot(): | 277 if self._platform_backend.CanTakeScreenshot(): |
| 276 self._cri.TakeScreenshotWithPrefix('login-screen') | 278 self._cri.TakeScreenshotWithPrefix('login-screen') |
| 277 raise exceptions.LoginException(error) | 279 raise exceptions.LoginException(error) |
| OLD | NEW |