Commit eb3baaa9 authored by achuith@chromium.org's avatar achuith@chromium.org

Replace dependance on /home/chronos/user with cryptohome-path.

BUG=314733
TEST=manual
NOTRY=True

Review URL: https://codereview.chromium.org/59353002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233459 0039d316-1c4b-4281-b951-d872f2087c98
parent 172e7511
...@@ -310,9 +310,15 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): ...@@ -310,9 +310,15 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
} }
''') ''')
def _CryptohomePath(self, user):
(path, _) = self._cri.RunCmdOnDevice(['cryptohome-path', 'user',
"'%s'" % user])
return path
def _IsCryptohomeMounted(self): def _IsCryptohomeMounted(self):
"""Returns True if a cryptohome vault is mounted at /home/chronos/user.""" """Returns True if a cryptohome vault at the user mount point."""
return self._cri.FilesystemMountedAt('/home/chronos/user').startswith( profile_path = self._CryptohomePath(self._username)
return self._cri.FilesystemMountedAt(profile_path).startswith(
'/home/.shadow/') '/home/.shadow/')
def _HandleUserImageSelectionScreen(self): def _HandleUserImageSelectionScreen(self):
...@@ -374,8 +380,9 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend): ...@@ -374,8 +380,9 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
pass pass
def _WaitForGuestFsMounted(self): def _WaitForGuestFsMounted(self):
"""Waits for /home/chronos/user to be mounted as guestfs""" """Waits for the guest user to be mounted as guestfs"""
util.WaitFor(lambda: (self._cri.FilesystemMountedAt('/home/chronos/user') == guest_path = self._CryptohomePath('$guest')
util.WaitFor(lambda: (self._cri.FilesystemMountedAt(guest_path) ==
'guestfs'), 20) 'guestfs'), 20)
def _NavigateGuestLogin(self): def _NavigateGuestLogin(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment