x/python-ganttclient
Code Issues Proposed changes

Fix bug and remove update lock in db.instance_test_and_set()

Browse Source 
Remove session from arguments.

Instance update works through one query, so we don't need to use update lock.

Add tests for instance_test_and_set().

blueprint db-session-cleanup

Change-Id: I143877f427f5eba4a7c7aa985bb70c79a9513822
This commit is contained in:
Boris Pavlovic
2012-12-23 07:03:55 +04:00
parent a7c494b47a
commit 19f7221d23
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nova/tests/test_db_api.py
View File

@@ -284,6 +284,27 @@ class DbApiTestCase(test.TestCase):
self.assertRaises(exception.DuplicateVlan, self.assertRaises(exception.DuplicateVlan,
db.network_create_safe, ctxt, values2) db.network_create_safe, ctxt, values2)
def test_instance_test_and_set(self):
ctxt = context.get_admin_context()
states = [
(None, [None, 'some'], 'building'),
(None, [None], 'building'),
('building', ['building'], 'ready'),
('building', [None, 'building'], 'ready')]
for st in states:
inst = db.instance_create(ctxt, {'vm_state': st[0]})
uuid = inst['uuid']
db.instance_test_and_set(ctxt, uuid, 'vm_state', st[1], st[2])
inst = db.instance_get_by_uuid(ctxt, uuid)
self.assertEqual(inst["vm_state"], st[2])
def test_instance_test_and_set_exception(self):
ctxt = context.get_admin_context()
inst = db.instance_create(ctxt, {'vm_state': 'building'})
self.assertRaises(exception.InstanceInvalidState,
db.instance_test_and_set, ctxt,
inst['uuid'], 'vm_state', [None, 'disable'], 'run')
def test_instance_update_with_instance_uuid(self): def test_instance_update_with_instance_uuid(self):
""" test instance_update() works when an instance UUID is passed """ """ test instance_update() works when an instance UUID is passed """
ctxt = context.get_admin_context() ctxt = context.get_admin_context()