Index: chrome/test/functional/chromeos_device_policy.py |
diff --git a/chrome/test/functional/chromeos_device_policy.py b/chrome/test/functional/chromeos_device_policy.py |
index 85e6df20fc0996ea9598b050d114aae7b87c14d6..eae8da75cf5f664206b76d829240943c0246dadd 100644 |
--- a/chrome/test/functional/chromeos_device_policy.py |
+++ b/chrome/test/functional/chromeos_device_policy.py |
@@ -235,6 +235,40 @@ class ChromeosDevicePolicy(policy_base.PolicyTestBase): |
self._WaitForPodVisibility(username=self._usernames[0], visible=True) |
self._WaitForPodVisibility(username=self._usernames[1], visible=True) |
+ def SetTimezoneInCrosSettings(self, timezone): |
Joao da Silva
2012/07/27 13:40:57
Private methods' names start with _.
pneubeck (no reviews)
2012/07/31 22:21:05
Done.
|
+ self.SetCrosSetting('cros.system.timezone', timezone) |
+ |
+ _timezones = ['America/Barbados', 'Europe/Helsinki'] |
+ |
+ def testTimezoneSettingWithoutPolicy(self): |
+ """Without timezone policy, timezone changes by user are persistent.""" |
+ self.SetDevicePolicy(refresh=False) |
+ |
+ for timezone in self._timezones: |
+ self.Login(user_index=1, expect_success=True) |
+ self.SetTimezoneInCrosSettings(timezone) |
+ self.assertEqual(timezone, self.GetTimeInfo()['timezone']) |
+ |
+ self.Logout() |
+ self.assertEqual(timezone, self.GetTimeInfo()['timezone']) |
+ |
+ def testTimezoneSettingWithPolicy(self): |
+ """With timezone policy, timezone changes by user are reset on logout.""" |
+ self.SetDevicePolicy({'timezone':self._timezones[0]}, refresh=True) |
+ |
+ # Timezones are set on startup, i.e. everytime when loading the login |
+ # screen. Something like a browser restart may work, too. |
+ self.Login(user_index=1, expect_success=True) |
+ self.Logout() |
+ |
+ self.assertEqual(self._timezones[0], self.GetTimeInfo()['timezone']) |
+ |
+ self.Login(user_index=1, expect_success=True) |
+ self.SetTimezoneInCrosSettings(self._timezones[1]) |
Joao da Silva
2012/07/27 13:40:57
It seems to me that both uses of SetTimezoneInCros
pneubeck (no reviews)
2012/08/06 14:50:48
Done.
|
+ self.assertEqual(self._timezones[1], self.GetTimeInfo()['timezone']) |
+ |
+ self.Logout() |
+ self.assertEqual(self._timezones[0], self.GetTimeInfo()['timezone']) |
if __name__ == '__main__': |
pyauto_functional.Main() |