summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_compute.py9
-rw-r--r--nova/tests/test_compute_utils.py3
2 files changed, 8 insertions, 4 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 6ecf1a0f0..e003f96a0 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -426,7 +426,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload)
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)
def test_terminate_usage_notification(self):
@@ -455,7 +456,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload)
self.assertTrue('created_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):
"""Ensure failure when running an instance that already exists"""
@@ -582,7 +584,8 @@ class ComputeTestCase(BaseTestCase):
self.assertTrue('display_name' in payload)
self.assertTrue('created_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)
def test_resize_instance(self):
diff --git a/nova/tests/test_compute_utils.py b/nova/tests/test_compute_utils.py
index 12b98aa0b..a9c149108 100644
--- a/nova/tests/test_compute_utils.py
+++ b/nova/tests/test_compute_utils.py
@@ -91,5 +91,6 @@ class UsageInfoTestCase(test.TestCase):
'audit_period_ending'):
self.assertTrue(attr in payload,
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)