openstack/watcher
Code Issues Proposed changes

Merge "Removed unused parameter in dt_deserializer()"

Browse Source
This commit is contained in:
Jenkins
2016-02-03 00:13:38 +00:00
committed by Gerrit Code Review
parent 6a25bd983c 978bb11d4a
commit e520f5f452
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/objects/utils.py
View File

@@ -117,7 +117,7 @@ def dt_serializer(name):
return serializer return serializer
def dt_deserializer(instance, val): def dt_deserializer(val):
"""A deserializer method for datetime attributes.""" """A deserializer method for datetime attributes."""
if val is None: if val is None:
return None return None

7
watcher/tests/objects/test_objects.py
View File

@@ -172,10 +172,9 @@ class TestUtils(test_base.TestCase):
def test_dt_deserializer(self): def test_dt_deserializer(self):
dt = timeutils.parse_isotime('1955-11-05T00:00:00Z') dt = timeutils.parse_isotime('1955-11-05T00:00:00Z')
self.assertEqual(utils.dt_deserializer(None, timeutils.isotime(dt)), self.assertEqual(utils.dt_deserializer(timeutils.isotime(dt)), dt)
dt) self.assertIsNone(utils.dt_deserializer(None))
self.assertIsNone(utils.dt_deserializer(None, None)) self.assertRaises(ValueError, utils.dt_deserializer, 'foo')
self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo')
def test_obj_to_primitive_list(self): def test_obj_to_primitive_list(self):
class MyList(base.ObjectListBase, base.WatcherObject): class MyList(base.ObjectListBase, base.WatcherObject):