x/python-ganttclient
Code Issues Proposed changes

pull-up from trunk

Browse Source
This commit is contained in:
Kevin L. Mitchell
2011-08-02 16:30:41 +00:00
parent 7511e5488a de66b021eb
commit 0af9da2856
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/notifier/api.py
View File

@@ -80,6 +80,10 @@ def notify(publisher_id, event_type, priority, payload):
if priority not in log_levels: if priority not in log_levels:
raise BadPriorityException( raise BadPriorityException(
_('%s not in valid priorities' % priority)) _('%s not in valid priorities' % priority))
# Ensure everything is JSON serializable.
payload = utils.to_primitive(payload, convert_instances=True)
driver = utils.import_object(FLAGS.notification_driver) driver = utils.import_object(FLAGS.notification_driver)
msg = dict(message_id=str(uuid.uuid4()), msg = dict(message_id=str(uuid.uuid4()),
publisher_id=publisher_id, publisher_id=publisher_id,

8
nova/tests/test_compute.py
View File

@@ -496,8 +496,8 @@ class ComputeTestCase(test.TestCase):
db.instance_update(self.context, instance_id, db.instance_update(self.context, instance_id,
{'instance_type_id': inst_type['id']}) {'instance_type_id': inst_type['id']})
self.assertRaises(exception.ApiError, self.compute_api.resize, self.assertRaises(exception.CannotResizeToSmallerSize,
context, instance_id, 1) self.compute_api.resize, context, instance_id, 1)
self.compute.terminate_instance(context, instance_id) self.compute.terminate_instance(context, instance_id)
@@ -508,8 +508,8 @@ class ComputeTestCase(test.TestCase):
self.compute.run_instance(self.context, instance_id) self.compute.run_instance(self.context, instance_id)
self.assertRaises(exception.ApiError, self.compute_api.resize, self.assertRaises(exception.CannotResizeToSameSize,
context, instance_id, 1) self.compute_api.resize, context, instance_id, 1)
self.compute.terminate_instance(context, instance_id) self.compute.terminate_instance(context, instance_id)