client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py - Issue 1565001: test: Clean up site_login.py a bit.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.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

« no previous file with comments | « client/site_tests/logging_LogVolume/logging_LogVolume.py ('k') | client/site_tests/login_CryptohomeMounted/login_CryptohomeMounted.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py

diff --git a/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py b/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py

index 2f6a55de565a85195588d87289c2da3d9842e6cf..c67e0337ade49c31287b30c72350bdc50c678d4f 100644

--- a/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py

+++ b/client/site_tests/login_ChromeProfileSanitary/login_ChromeProfileSanitary.py

@@ -55,14 +55,14 @@ class login_ChromeProfileSanitary(test.test):

if not logged_in:

# Test account information embedded into json file.

- if not site_login.attempt_login(self, script):

- raise error.TestError('Could not login')

+ site_login.attempt_login(self, script)

# Get Default/Cookies mtime.

cookies_info = os.stat(chromeos_constants.LOGIN_PROFILE + '/Cookies')

cookies_mtime = cookies_info[stat.ST_MTIME]

# "crash" chrome.

+ site_login.wait_for_initial_chrome_window()

site_login.nuke_process_by_name(chromeos_constants.BROWSER,

with_prejudice = True)

site_login.wait_for_browser()

@@ -79,9 +79,7 @@ class login_ChromeProfileSanitary(test.test):

# Ensure chrome writes state to disk.

site_login.attempt_logout()

- site_login.wait_for_browser()

- if not site_login.attempt_login(self, script):

- raise error.TestError('Could not log back in')

+ site_login.attempt_login(self, script)

if not latch.is_set():

raise error.TestError('Never received callback from browser.')