openstack
/
nova
Code Issues Proposed changes

Fix test mock that abuses objects 

This corrects a test that was generating pseudo-db objects and hydrating
instances with them to mock compute_api.get().

Change-Id: Idde10da5cb6a8e26da727d084e7d17edd11fb27f
This commit is contained in:
Dan Smith 2015-08-03 09:42:13 -07:00
parent 4a96b90623
commit 8888ed43f1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py
View File

@ -123,16 +123,15 @@ def fake_instance_get_by_uuid_not_found(context, uuid,
def fake_instance_get_all_with_locked(context, list_locked, **kwargs):
db_list = []
obj_list = []
s_id = 0
for locked in list_locked:
uuid = fakes.get_fake_uuid(locked)
s_id = s_id + 1
kwargs['locked_by'] = None if locked == 'not_locked' else locked
server = fakes.stub_instance(id=s_id, uuid=uuid, **kwargs)
db_list.append(server)
return instance_obj._make_instance_list(
context, objects.InstanceList(), db_list, FIELDS)
server = fakes.stub_instance_obj(context, id=s_id, uuid=uuid, **kwargs)
obj_list.append(server)
return objects.InstanceList(objects=obj_list)
class MockSetAdminPassword(object):