cloud-init-dev team mailing list archive

[Joshua Powers <josh.powers@xxxxxxxxxxxxx>]

Joshua Powers has proposed merging ~powersj/cloud-init:test_timezone into cloud-init:master.

Commit message:
test: add daylight savings timezone as valid

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~powersj/cloud-init/+git/cloud-init/+merge/319711

Test run:
https://paste.ubuntu.com/24171219/
-- 
Your team cloud init development team is requested to review the proposed merge of ~powersj/cloud-init:test_timezone into cloud-init:master.

diff --git a/tests/cloud_tests/testcases/modules/timezone.py b/tests/cloud_tests/testcases/modules/timezone.py
index 272c266..9741ff4 100644
--- a/tests/cloud_tests/testcases/modules/timezone.py
+++ b/tests/cloud_tests/testcases/modules/timezone.py
@@ -9,7 +9,7 @@ class TestTimezone(base.CloudTestCase):
 
     def test_timezone(self):
         """Test date prints correct timezone"""
-        out = self.get_data_file('timezone')
-        self.assertIn('HST', out)
+        out = self.get_data_file('timezone').strip('\n')
+        self.assertIn(out, ['HST', 'HDT'])
 
 # vi: ts=4 expandtab