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

Unified Diff: client/bin/chromeos_constants.py

Issue 5216005: autotest: Test RestartEntd dbus call (Closed) Base URL: http://git.chromium.org/git/autotest.git@master
Patch Set: Respond to rgindas comments Created 10 years, 1 month 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 | client/site_tests/login_DBusCalls/control » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/bin/chromeos_constants.py
diff --git a/client/bin/chromeos_constants.py b/client/bin/chromeos_constants.py
index 462bc985959f2c2ede3ce4193e08b858ac36f475..1a134d9e46794c8a2cd1f10ba829a2b785ac41a2 100644
--- a/client/bin/chromeos_constants.py
+++ b/client/bin/chromeos_constants.py
@@ -4,12 +4,27 @@
# The names of expected mount-points, devices, magic files, etc on chrome os.
-CHROME_LOG_DIR = '/var/log/chrome'
+# Constants used by other constants.
USER_DATA_DIR = '/home/chronos'
+WHITELIST_DIR = '/var/lib/whitelist'
-LOGIN_PROFILE = USER_DATA_DIR+'/Default'
+
+# Rest of constants.
+BROWSER = 'chrome'
+
+CHROME_LOG_DIR = '/var/log/chrome'
+CHROME_WINDOW_MAPPED_MAGIC_FILE = \
+ '/var/run/state/windowmanager/initial-chrome-window-mapped'
CLEANUP_LOGS_PAUSED_FILE = '/var/lib/cleanup_logs_paused'
+
+CLIENT_LOGIN_URL = '/accounts/ClientLogin'
+
+CREDENTIALS = {
+ '$default': ['performance.test.account@gmail.com', 'perfsmurf'],
+ '$backdoor': ['chronos@gmail.com', 'chronos'],
+}
+
# TODO(fes): With the switch to ecryptfs, the cryptohome device is no longer
# static--it includes a system-specific hash of the username whose vault is
# mounted. seano points out that this is no longer a constant, and we may want
@@ -20,35 +35,26 @@ CRYPTOHOME_MOUNT_PT = USER_DATA_DIR+'/user'
CRYPTOHOMED_LOG = '/var/log/cryptohomed.log'
-LOGIN_TRUST_ROOTS = '/etc/login_trust_root.pem'
-
-BROWSER = 'chrome'
-SESSION_MANAGER = 'session_manager'
-WINDOW_MANAGER = 'chromeos-wm'
+DISABLE_BROWSER_RESTART_MAGIC_FILE = '/tmp/disable_chrome_restart'
LOGGED_IN_MAGIC_FILE = '/var/run/state/logged-in'
-CHROME_WINDOW_MAPPED_MAGIC_FILE = \
- '/var/run/state/windowmanager/initial-chrome-window-mapped'
-
-DISABLE_BROWSER_RESTART_MAGIC_FILE = '/tmp/disable_chrome_restart'
-
+LOGIN_PROFILE = USER_DATA_DIR+'/Default'
+LOGIN_SERVICE = 'gaia'
+LOGIN_ERROR = 'Error=BadAuthentication'
LOGIN_PROMPT_READY_MAGIC_FILE = '/tmp/uptime-login-prompt-ready'
+LOGIN_TRUST_ROOTS = '/etc/login_trust_root.pem'
-CREDENTIALS = {
- '$default': ['performance.test.account@gmail.com', 'perfsmurf'],
- '$backdoor': ['chronos@gmail.com', 'chronos'],
-}
+ISSUE_AUTH_TOKEN_URL = '/accounts/IssueAuthToken'
-WHITELIST_DIR = '/var/lib/whitelist'
OWNER_KEY_FILE = WHITELIST_DIR+'/owner.key'
+
+SESSION_MANAGER = 'session_manager'
SIGNED_PREFERENCES_FILE = WHITELIST_DIR+'/preferences'
-CLIENT_LOGIN_URL = '/accounts/ClientLogin'
-ISSUE_AUTH_TOKEN_URL = '/accounts/IssueAuthToken'
TOKEN_AUTH_URL = '/accounts/TokenAuth'
-LOGIN_SERVICE = 'gaia'
-LOGIN_ERROR = 'Error=BadAuthentication'
-
+UI_LOG = '/var/log/ui/ui.LATEST'
UPDATE_ENGINE_LOG = '/var/log/update_engine.log'
+
+WINDOW_MANAGER = 'chromeos-wm'
« no previous file with comments | « no previous file | client/site_tests/login_DBusCalls/control » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698