From 414e1457632b5eea82274ad8694d2b324d4e200e Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 4 Jun 2013 14:43:16 -0700 Subject: Make the datetime utility function coerce to UTC Getting datetime objects from existing sources (i.e. sqlalchemy) is problematic because they're "timezone naive". Make the utility function coerce these to UTC for easier conversion. Related to blueprint unified-object-model Change-Id: I61bc6b13f9bd9441d64cc6930e43e921af72a342 --- nova/tests/objects/test_objects.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nova/tests') diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py index cbaf8cb17..e7508ba38 100644 --- a/nova/tests/objects/test_objects.py +++ b/nova/tests/objects/test_objects.py @@ -15,6 +15,7 @@ import contextlib import datetime import gettext +import iso8601 import netaddr gettext.install('nova') @@ -118,8 +119,12 @@ class TestMetaclass(test.TestCase): class TestUtils(test.TestCase): def test_datetime_or_none(self): - dt = datetime.datetime.now() + naive_dt = datetime.datetime.now() + dt = timeutils.parse_isotime(timeutils.isotime(naive_dt)) self.assertEqual(utils.datetime_or_none(dt), dt) + self.assertEqual(utils.datetime_or_none(dt), + naive_dt.replace(tzinfo=iso8601.iso8601.Utc(), + microsecond=0)) self.assertEqual(utils.datetime_or_none(None), None) self.assertRaises(ValueError, utils.datetime_or_none, 'foo') -- cgit