summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-12-01 17:20:29 -0500
committerAlex Meade <alex.meade@rackspace.com>2011-12-01 17:20:29 -0500
commit6d40314ea5f0bfdcc80a7cfe17353cbba07e0bab (patch)
tree7bf6b814953acfb0284c98e6ac333cd656bfe296 /nova/tests
parentb44dc5cb34806157ab1e3e3389ddc79594a90e75 (diff)
Convert get_lock in compute to use uuids
Related to blueprint internal-uuids. Change-Id: I547e4c5c06d761c2d7c6c7635fd365834b3c5347
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_compute.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index a193c7e49..bcc4ee9a8 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -680,6 +680,13 @@ class ComputeTestCase(BaseTestCase):
self.compute.terminate_instance(self.context, instance['uuid'])
+ def test_get_lock(self):
+ instance = self._create_fake_instance()
+ instance_uuid = instance['uuid']
+ self.assertFalse(self.compute.get_lock(self.context, instance_uuid))
+ db.instance_update(self.context, instance_uuid, {'locked': True})
+ self.assertTrue(self.compute.get_lock(self.context, instance_uuid))
+
def test_lock(self):
"""ensure locked instance cannot be changed"""
instance = self._create_fake_instance()
@@ -2346,7 +2353,7 @@ class ComputeAPITestCase(BaseTestCase):
def test_get_lock(self):
instance = self._create_fake_instance()
self.assertFalse(self.compute_api.get_lock(self.context, instance))
- db.instance_update(self.context, instance['id'], {'locked': True})
+ db.instance_update(self.context, instance['uuid'], {'locked': True})
self.assertTrue(self.compute_api.get_lock(self.context, instance))
def test_add_remove_security_group(self):