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

Unified Diff: tools/telemetry/telemetry/core/chrome/cros_util.py

Issue 15747016: Make cros login error message more descriptive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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/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)
« 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