diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-01-03 12:24:34 -0800 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-01-03 12:29:59 -0800 |
| commit | 0ccb03b37a74943430c2e81a3955a94d2c8136c0 (patch) | |
| tree | 0d9e5ce4fccdf42871e6f9673c50e0c742adb0f8 /tests/unit/test_timeutils.py | |
| parent | fdc74c07d63ff897f42405b6dde0ffa46d6e26c3 (diff) | |
| download | oslo-0ccb03b37a74943430c2e81a3955a94d2c8136c0.tar.gz oslo-0ccb03b37a74943430c2e81a3955a94d2c8136c0.tar.xz oslo-0ccb03b37a74943430c2e81a3955a94d2c8136c0.zip | |
Fix timezone handling in timeutils tests
The tests for timeutils use some canned datetime values that include
timezones, and override the result of utcnow() with the same. This
is not correct because the real utcnow() returns naive datetime
objects, so tests that assume the contrary are incorrect.
This came about because I was unable to satisfy both the oslo unit
tests and the nova ones with the same code. That happened because
the oslo ones override utcnow() with an invalid result, and the
nova tests use the real one.
Change-Id: I683818f77ce0d3e3b2f07c0326d7a7196f3346c3
Diffstat (limited to 'tests/unit/test_timeutils.py')
| -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() |