openstack
/
heat
Code Issues Proposed changes

Merge "Removed 'message' keyword when raising Error"

This commit is contained in:
Jenkins 2014-06-25 21:14:27 +00:00 committed by Gerrit Code Review
parent a081e954f7 dc42406b90
commit 6912f7b101
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/resources/glance_utils.py
View File

@ -55,7 +55,7 @@ def get_image_id_by_name(glance_client, image_identifier):
image_list = list(glance_client.images.list(filters=filters))
except glance_exceptions.ClientException as ex:
raise exception.Error(
message=(_("Error retrieving image list from glance: %s") % ex))
_("Error retrieving image list from glance: %s") % ex)
num_matches = len(image_list)
if num_matches == 0:
logger.info(_("Image %s was not found in glance") %

18
heat/tests/test_glance_utils.py
View File

@ -72,6 +72,23 @@ class GlanceUtilsTests(HeatTestCase):
img_name))
self.m.VerifyAll()
def test_get_image_id_glance_exception(self):
"""Test get_image_id when glance raises an exception."""
# Simulate HTTP exception
self.glance_client.images = self.m.CreateMockAnything()
img_name = str(uuid.uuid4())
filters = {'name': img_name}
self.glance_client.images.list(filters=filters).AndRaise(
glance_exceptions.ClientException("Error"))
self.m.ReplayAll()
expected_error = "Error retrieving image list from glance: Error"
e = self.assertRaises(exception.Error,
glance_utils.get_image_id_by_name,
self.glance_client, img_name)
self.assertEqual(expected_error, str(e))
self.m.VerifyAll()
def test_get_image_id_not_found(self):
"""Tests the get_image_id function while image is not found."""
my_image = self.m.CreateMockAnything()
@ -102,7 +119,6 @@ class GlanceUtilsTests(HeatTestCase):
self.glance_client.images.list(filters=filters).MultipleTimes().\
AndReturn(image_list)
self.m.ReplayAll()
self.assertRaises(exception.PhysicalResourceNameAmbiguity,
glance_utils.get_image_id,
self.glance_client, img_name)