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

Unified Diff: chrome/test/functional/chromeos_device_policy.py

Issue 10829235: Revert r150536 - "Added a timezone policy and pyauto tests for it." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/policy/proto/chrome_device_policy.proto ('k') | chrome/test/functional/chromeos_time.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 d32d0c43aebb63c42ca5bd11c9a27c0f130d54a5..99d415b5ad8f42a00ed21e88789724978e71ed79 100644
--- a/chrome/test/functional/chromeos_device_policy.py
+++ b/chrome/test/functional/chromeos_device_policy.py
@@ -187,37 +187,6 @@ class ChromeosDevicePolicy(policy_base.PolicyTestBase):
self._WaitForPodVisibility(username=self._usernames[0], visible=True)
self._WaitForPodVisibility(username=self._usernames[1], visible=True)
- _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.SetTimezone(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.SetTimezone(self._timezones[1])
- self.assertEqual(self._timezones[1], self.GetTimeInfo()['timezone'])
-
- self.Logout()
- self.assertEqual(self._timezones[0], self.GetTimeInfo()['timezone'])
if __name__ == '__main__':
pyauto_functional.Main()
« no previous file with comments | « chrome/browser/policy/proto/chrome_device_policy.proto ('k') | chrome/test/functional/chromeos_time.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698