Merge pull request #13702 from AndreiH/bug937660_v1.2

Bug 937660 - Move timezone settings from the setUp into testvars.json
mozilla-b2g · Nov 14, 2013 · da89963 · da89963
2 parents 9aa8583 + 6281b49
commit da89963
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/tests/python/gaia-ui-tests/README.md b/tests/python/gaia-ui-tests/README.md
@@ -229,6 +229,15 @@ Or:
     "<setting>":<value>
 }"
 ```
+__Note__: When running with no SIM card or offline the timezone may not be automatically updated to match the local timezone. In that case you may need to force the timezone to match the desired timezone using settings in testvars.json which will set it during the test setUp:
+
+```
+"settings:{
+    "time.timezone": <value>,
+    "time.timezone.user-selected": <value>
+}"
+```
+
 
 
 Test data Prerequisites

diff --git a/tests/python/gaia-ui-tests/gaiatest/gaia_test.py b/tests/python/gaia-ui-tests/gaiatest/gaia_test.py
@@ -493,10 +493,6 @@ def cleanUp(self):
         # Switch off keyboard FTU screen
         self.data_layer.set_setting("keyboard.ftu.enabled", False)
 
-        # Change timezone back to PST
-        self.data_layer.set_setting("time.timezone", "America/Los_Angeles")
-        self.data_layer.set_setting("time.timezone.user-selected", "America/Los_Angeles")
-
         # restore settings from testvars
         [self.data_layer.set_setting(name, value) for name, value in self.testvars.get('settings', {}).items()]