x/python-ganttclient
Code Issues Proposed changes

Merge "Log the URL to an image_ref and not just the ID."

Browse Source
This commit is contained in:
Jenkins
2011-11-15 17:50:32 +00:00
committed by Gerrit Code Review
parent 5b10461388 f78660759f
commit 113531e0e7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/test_compute.py
View File

@@ -426,7 +426,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload) self.assertTrue('launched_at' in payload)
self.assertTrue(payload['launched_at']) self.assertTrue(payload['launched_at'])
self.assertEquals(payload['image_ref'], '1') image_ref_url = "%s/images/1" % utils.generate_glance_url()
self.assertEquals(payload['image_ref_url'], image_ref_url)
self.compute.terminate_instance(self.context, instance_id) self.compute.terminate_instance(self.context, instance_id)
def test_terminate_usage_notification(self): def test_terminate_usage_notification(self):
@@ -455,7 +456,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload) self.assertTrue('display_name' in payload)
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload) self.assertTrue('launched_at' in payload)
self.assertEquals(payload['image_ref'], '1') image_ref_url = "%s/images/1" % utils.generate_glance_url()
self.assertEquals(payload['image_ref_url'], image_ref_url)
def test_run_instance_existing(self): def test_run_instance_existing(self):
"""Ensure failure when running an instance that already exists""" """Ensure failure when running an instance that already exists"""
@@ -582,7 +584,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload) self.assertTrue('display_name' in payload)
self.assertTrue('created_at' in payload) self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload) self.assertTrue('launched_at' in payload)
self.assertEquals(payload['image_ref'], '1') image_ref_url = "%s/images/1" % utils.generate_glance_url()
self.assertEquals(payload['image_ref_url'], image_ref_url)
self.compute.terminate_instance(context, instance_id) self.compute.terminate_instance(context, instance_id)
def test_resize_instance(self): def test_resize_instance(self):

3
nova/tests/test_compute_utils.py
View File

@@ -91,5 +91,6 @@ class UsageInfoTestCase(test.TestCase):
'audit_period_ending'): 'audit_period_ending'):
self.assertTrue(attr in payload, self.assertTrue(attr in payload,
msg="Key %s not in payload" % attr) msg="Key %s not in payload" % attr)
self.assertEquals(payload['image_ref'], '1') image_ref_url = "%s/images/1" % utils.generate_glance_url()
self.assertEquals(payload['image_ref_url'], image_ref_url)
self.compute.terminate_instance(self.context, instance_id) self.compute.terminate_instance(self.context, instance_id)