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

Unified Diff: client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py

Issue 1565001: test: Clean up site_login.py a bit. (Closed)
Patch Set: update one more call to attempt_logout() Created 10 years, 9 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
Index: client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py
diff --git a/client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py b/client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py
index 29123ca5cf9671ff8c7d87a704360232a00ed554..4fbca86f3e66400b3c29a9cc176859e4fedb5b33 100644
--- a/client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py
+++ b/client/site_tests/login_CryptohomeUnmounted/login_CryptohomeUnmounted.py
@@ -18,14 +18,12 @@ class login_CryptohomeUnmounted(test.test):
# Require that the cryptohome is mounted before testing that
# logging out will unmount it. This requires logging in.
if not logged_in:
- if not site_login.attempt_login(self, script):
- raise error.TestError('Could not login')
+ site_login.attempt_login(self, script)
if not site_cryptohome.is_mounted(allow_fail = is_control):
raise error.TestFail('Expected cryptohome to be mounted')
- if not site_login.attempt_logout():
- raise error.TestError('Could not logout')
+ site_login.attempt_logout()
# allow the command to fail, so we can handle the error here
if site_cryptohome.is_mounted(allow_fail = True):
@@ -33,5 +31,4 @@ class login_CryptohomeUnmounted(test.test):
# If we started logged in, reset the state.
if logged_in:
- if not site_login.attempt_login(self, script):
- raise error.TestError('Could not login')
+ site_login.attempt_login(self, script)

Powered by Google App Engine
This is Rietveld 408576698