diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 15:04:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 15:04:49 +0000 |
| commit | 4234f240f72a844686900944a247f7de2a4ac29c (patch) | |
| tree | 33889f9945ae43fe920d84df267f2c1f406d205a /tests | |
| parent | bc954f7251f098c1d56cf2bbe0932cd9d62e2fb2 (diff) | |
| parent | 0ccb03b37a74943430c2e81a3955a94d2c8136c0 (diff) | |
| download | oslo-4234f240f72a844686900944a247f7de2a4ac29c.tar.gz oslo-4234f240f72a844686900944a247f7de2a4ac29c.tar.xz oslo-4234f240f72a844686900944a247f7de2a4ac29c.zip | |
Merge "Fix timezone handling in timeutils tests"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_timeutils.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/unit/test_timeutils.py b/tests/unit/test_timeutils.py index 8236032..b5cd898 100644 --- a/tests/unit/test_timeutils.py +++ b/tests/unit/test_timeutils.py @@ -27,14 +27,10 @@ from openstack.common import timeutils class TimeUtilsTest(unittest.TestCase): def setUp(self): - utc_timezone = iso8601.iso8601.UTC self.skynet_self_aware_time_str = '1997-08-29T06:14:00Z' - self.skynet_self_aware_time = datetime.datetime(1997, 8, 29, 6, 14, 0, - tzinfo=utc_timezone) - self.one_minute_before = datetime.datetime(1997, 8, 29, 6, 13, 0, - tzinfo=iso8601.iso8601.UTC) - self.one_minute_after = datetime.datetime(1997, 8, 29, 6, 15, 0, - tzinfo=iso8601.iso8601.UTC) + self.skynet_self_aware_time = datetime.datetime(1997, 8, 29, 6, 14, 0) + self.one_minute_before = datetime.datetime(1997, 8, 29, 6, 13, 0) + self.one_minute_after = datetime.datetime(1997, 8, 29, 6, 15, 0) self.skynet_self_aware_time_perfect_str = '1997-08-29T06:14:00.000000' self.skynet_self_aware_time_perfect = datetime.datetime(1997, 8, 29, 6, 14, 0) @@ -50,7 +46,9 @@ class TimeUtilsTest(unittest.TestCase): def test_parse_isotime(self): expect = timeutils.parse_isotime(self.skynet_self_aware_time_str) - self.assertEqual(self.skynet_self_aware_time, expect) + skynet_self_aware_time_utc = self.skynet_self_aware_time.replace( + tzinfo=iso8601.iso8601.UTC) + self.assertEqual(skynet_self_aware_time_utc, expect) def test_strtime(self): expect = timeutils.strtime(self.skynet_self_aware_time_perfect) @@ -90,8 +88,7 @@ class TimeUtilsTest(unittest.TestCase): def test_utcnow_ts(self): skynet_self_aware_timestamp = 872835240 dt = datetime.datetime.utcfromtimestamp(skynet_self_aware_timestamp) - expect = dt.replace(tzinfo=iso8601.iso8601.UTC) - self.assertEqual(self.skynet_self_aware_time, expect) + self.assertEqual(self.skynet_self_aware_time, dt) with mock.patch('datetime.datetime') as datetime_mock: datetime_mock.utcnow.return_value = self.skynet_self_aware_time ts = timeutils.utcnow_ts() |