Index: tools/telemetry/telemetry/core/chrome/cros_util.py |
diff --git a/tools/telemetry/telemetry/core/chrome/cros_util.py b/tools/telemetry/telemetry/core/chrome/cros_util.py |
index 357aa9179068748f7f2eaa1dbad0580d2b2c0db2..d13c2ef936f0e1dbee53aaaf33d984da2740685b 100644 |
--- a/tools/telemetry/telemetry/core/chrome/cros_util.py |
+++ b/tools/telemetry/telemetry/core/chrome/cros_util.py |
@@ -76,7 +76,13 @@ def NavigateGuestLogin(browser_backend, cri): |
def NavigateLogin(browser_backend): |
"""Navigates through oobe login screen""" |
# Dismiss the user image selection screen. |
- util.WaitFor(lambda: _WebContentsNotOobe(browser_backend), 15) |
+ try: |
+ util.WaitFor(lambda: _WebContentsNotOobe(browser_backend), 15) |
+ except util.TimeoutException: |
+ raise exceptions.LoginException( |
+ 'Timed out going through oobe screen. Make sure the custom auth ' |
+ 'extension passed through --auth-ext-path is valid and belongs ' |
+ 'to user "chronos".') |
# Wait for the startup window, then close it. |
util.WaitFor(lambda: _StartupWindow(browser_backend) is not None, 20) |