client/cros/constants.py - Issue 6880288: [autotest] Add test for the re-taking of ownership after the owner key is lost

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/cros/constants.py

Issue 6880288: [autotest] Add test for the re-taking of ownership after the owner key is lost (Closed) Base URL: http://git.chromium.org/git/autotest.git@master

Patch Set: cleanup more unneeded vars Created 9 years, 8 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/cros/constants.py

diff --git a/client/cros/constants.py b/client/cros/constants.py

index de97890a3571cf566716242a5383945f898b3aea..019289e2b2b6e48ff811cf68e1ee8409265caa5a 100644

--- a/client/cros/constants.py

+++ b/client/cros/constants.py

@@ -39,6 +39,7 @@ CRYPTOHOME_MOUNT_PT = USER_DATA_DIR + '/user'

CRYPTOHOMED_LOG = '/var/log/cryptohomed.log'

DISABLE_BROWSER_RESTART_MAGIC_FILE = '/tmp/disable_chrome_restart'

+DEFAULT_OWNERSHIP_TIMEOUT = 300 # Ownership is an inherently random process.

FLIMFLAM_TEST_PATH = '/usr/lib/flimflam/test/'

@@ -58,7 +59,6 @@ OWNER_KEY_FILE = WHITELIST_DIR + '/owner.key'

SESSION_MANAGER = 'session_manager'

SESSION_MANAGER_LOG = '/var/log/session_manager'

-SIGNED_PREFERENCES_FILE = WHITELIST_DIR + '/preferences'

SIGNED_POLICY_FILE = WHITELIST_DIR + '/policy'

SPECIAL_CASE_DOMAIN = 'gmail.com'

« no previous file with comments | « no previous file | client/cros/cros_ui_test.py » ('j') | client/cros/ownership.py » ('J')