diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-05 02:06:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-05 02:06:22 +0000 |
| commit | ebecd7848336e3db35720bc49ec6604e8af656fb (patch) | |
| tree | 48d8607eb48c743943cbee93fdca8a9bd8452b56 /nova/tests | |
| parent | fda9f113ccd39711ae1ffe759838352080993169 (diff) | |
| parent | 820135933168feeb6320a23555ca0ebf5e14fa08 (diff) | |
| download | nova-ebecd7848336e3db35720bc49ec6604e8af656fb.tar.gz nova-ebecd7848336e3db35720bc49ec6604e8af656fb.tar.xz nova-ebecd7848336e3db35720bc49ec6604e8af656fb.zip | |
Merge "Make instance object tolerate isotime strings"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/objects/test_objects.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py index 754358230..cbaf8cb17 100644 --- a/nova/tests/objects/test_objects.py +++ b/nova/tests/objects/test_objects.py @@ -123,6 +123,14 @@ class TestUtils(test.TestCase): self.assertEqual(utils.datetime_or_none(None), None) self.assertRaises(ValueError, utils.datetime_or_none, 'foo') + def test_datetime_or_str_or_none(self): + dts = timeutils.isotime() + dt = timeutils.parse_isotime(dts) + self.assertEqual(utils.datetime_or_str_or_none(dt), dt) + self.assertEqual(utils.datetime_or_str_or_none(None), None) + self.assertEqual(utils.datetime_or_str_or_none(dts), dt) + self.assertRaises(ValueError, utils.datetime_or_str_or_none, 'foo') + def test_int_or_none(self): self.assertEqual(utils.int_or_none(1), 1) self.assertEqual(utils.int_or_none('1'), 1) |