[chromeos] Simplify ephemeral users tests

chrome/test/functional/chromeos_ephemeral.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 import os
 import sys
 
 import pyauto_functional  # Must come before pyauto (and thus, policy_base).
 import policy_base
 
 sys.path.append('/usr/local')  # Required to import autotest libs.
 from autotest.cros import constants
 from autotest.cros import cryptohome
 
 
 class ChromeosEphemeral(policy_base.PolicyTestBase):
   """Tests a policy that makes users ephemeral.
 
   When this policy is enabled, no persistent information in the form of
   cryptohome shadow directories or local state prefs should be created for
   users. Additionally, any persistent information previously accumulated should
   be cleared when a user first logs in after enabling the policy."""
 
+  _usernames = ('alice@example.com', 'bob@example.com')
+
   def _SetEphemeralUsersEnabled(self, enabled):
     """Sets the ephemeral users device policy.
 
-    TODO(bartfab): Ensure Login still works after crosbug.com/20709 is fixed.
     The show_user_names policy is set to False to ensure that even if the local
     state is not being automatically cleared, the login screen never shows user
     pods. This is required by the Login browser automation call.
     """
     self.SetDevicePolicy({'ephemeral_users_enabled': enabled,
                           'show_user_names': False})
 
   def _DoesVaultDirectoryExist(self, user_index):
     user_hash = cryptohome.get_user_hash(self._usernames[user_index])
     return os.path.exists(os.path.join(constants.SHADOW_ROOT, user_hash))
@@ skipping 36 matching lines @@
                                     user=self._usernames[user_index],
                                     allow_fail=True),
         msg='Expected vault backed by %s to be mounted.' %
             'tmpfs' if ephemeral else 'shadow directory')
 
   def _AssertNoVaultMounted(self):
     self.assertFalse(cryptohome.is_vault_mounted(allow_fail=True),
                      msg='Did not expect any vault to be mounted.')
 
   def Login(self, user_index):
+    """Convenience method to login to the usr at the given index."""
     self.assertFalse(self.GetLoginInfo()['is_logged_in'],
                      msg='Expected to be logged out.')
     policy_base.PolicyTestBase.Login(self,
                                      self._usernames[user_index],
                                      'dummy_password')
     self.assertTrue(self.GetLoginInfo()['is_logged_in'],
                     msg='Expected to be logged in.')
 
-  def ExtraChromeFlags(self):
-    """Sets up Chrome to skip OOBE.
-
-    TODO(bartfab): Ensure OOBE is still skipped when crosbug.com/20709 is fixed.
-    Disabling automatic clearing of the local state has the curious side effect
-    of removing a flag that disables OOBE. This method adds back the flag.
-    """
-    flags = policy_base.PolicyTestBase.ExtraChromeFlags(self)
-    flags.append('--login-screen=login')
-    return flags
-
-  def setUp(self):
-    policy_base.PolicyTestBase.setUp(self)
-    # TODO(bartfab): Remove this after crosbug.com/20709 is fixed.
-    # Try to disable automatic clearing of the local state.
-    self.TryToDisableLocalStateAutoClearingOnChromeOS()
-    self._local_state_auto_clearing = \
-        self.IsLocalStateAutoClearingEnabledOnChromeOS()
-    if not self._local_state_auto_clearing:
-      # Prevent the inherited Logout() method from cleaning up /home/chronos
-      # as this also clears the local state.
-      self.set_clear_profile(False)

[bartfab (slow), 2012/07/27 08:11:22]

Is this no longer needed either with the recent changes? Will Logout() not clear
out the profile by default?

[Nirnimesh, 2012/07/27 08:24:21]

Logout() does not clear user profile (/home/chronos/user).
"Local State" used to get cleared on logout when /root/.forget_usernames was
around. Not anymore.

[bartfab (slow), 2012/07/27 08:28:39]

There is a set_clear_profile()/get_clear_profile() combo that, when set, would
cause __SetUp() to clear the user's profile. But I see now that as you say,
Logout() actually clears the flag before doing anything, so clearing it
ourselves is unnecessary. Perfect. Thanks for clarifying.

-
-    self._usernames = ('alice@example.com', 'bob@example.com')
-
-  def tearDown(self):
-    # TODO(bartfab): Remove this after crosbug.com/20709 is fixed.
-    # Try to re-enable automatic clearing of the local state and /home/chronos.
-    if not self._local_state_auto_clearing:
-      self.TryToEnableLocalStateAutoClearingOnChromeOS()
-      self.set_clear_profile(True)
-    policy_base.PolicyTestBase.tearDown(self)
-
   def testEnablingBeforeSession(self):
     """Checks that a new session can be made ephemeral."""
     self.PrepareToWaitForLoginFormReload()
     self._SetEphemeralUsersEnabled(True)
     self.WaitForLoginFormReload()
 
     self.Login(user_index=0)
     self._AssertLocalStatePrefsEmpty()
     self._AssertVaultMounted(user_index=0, ephemeral=True)
     self.Logout()
@@ skipping 20 matching lines @@
     self._AssertNoVaultMounted()
     self._AssertVaultDirectoryDoesNotExist(user_index=0)
 
   def testDisablingDuringSession(self):
     """Checks that an existing ephemeral session is not made non-ephemeral."""
     self.PrepareToWaitForLoginFormReload()
     self._SetEphemeralUsersEnabled(True)
     self.WaitForLoginFormReload()
 
     self.Login(user_index=0)
-    # TODO(bartfab): Remove this when crosbug.com/20709 is fixed.
-    if self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsEmpty()
     self._AssertVaultMounted(user_index=0, ephemeral=True)
     self._SetEphemeralUsersEnabled(False)
     self._AssertVaultMounted(user_index=0, ephemeral=True)
     self.Logout()
 
-    # TODO(bartfab): Make this unconditional when crosbug.com/20709 is fixed.
-    if not self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsEmpty()
+    self._AssertLocalStatePrefsEmpty()
     self._AssertNoVaultMounted()
     self._AssertVaultDirectoryDoesNotExist(user_index=0)
 
   def testEnablingEphemeralUsersCleansUp(self):
     """Checks that persistent information is cleared."""
     self.PrepareToWaitForLoginFormReload()
     self._SetEphemeralUsersEnabled(False)
     self.WaitForLoginFormReload()
 
     self.Login(user_index=0)
-    # TODO(bartfab): Remove this when crosbug.com/20709 is fixed.
-    if self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsSet(user_indexes=[0])
     self.Logout()
-    # TODO(bartfab): Make this unconditional when crosbug.com/20709 is fixed.
-    if not self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsSet(user_indexes=[0])
+    self._AssertLocalStatePrefsSet(user_indexes=[0])
 
     self.Login(user_index=1)
-    # TODO(bartfab): Remove this when crosbug.com/20709 is fixed.
-    if self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsSet(user_indexes=[1])
     self.Logout()
-    # TODO(bartfab): Make this unconditional when crosbug.com/20709 is fixed.
-    if not self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsSet(user_indexes=[0, 1])
+    self._AssertLocalStatePrefsSet(user_indexes=[0, 1])
 
     self._AssertVaultDirectoryExists(user_index=0)
     self._AssertVaultDirectoryExists(user_index=1)
 
     self._SetEphemeralUsersEnabled(True)
 
     self.Login(user_index=0)
-    # TODO(bartfab): Remove this when crosbug.com/20709 is fixed.
-    if self._local_state_auto_clearing:
-      self._AssertLocalStatePrefsEmpty()
     self._AssertVaultMounted(user_index=0, ephemeral=True)
     self.Logout()
 
     self._AssertVaultDirectoryDoesNotExist(user_index=0)
     self._AssertVaultDirectoryDoesNotExist(user_index=1)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()