openstack/horizon
Code Issues Proposed changes

Correct return values of mocked methods in LBaaS API test

Browse Source 
Mocked methods of neutronclient should return data structure
which neutronclient returns, but Horizon internal API object
(which inherits APIDictWrapper) is returned so far.

Change-Id: Ifbaeea3234bc232c8bbd2bb6ed2dd8f236358d1b
Closes-Bug: #1360279
This commit is contained in:
Akihiro Motoki 2014-08-22 23:22:33 +09:00
parent cc945f9070
commit d83d6fe8e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/test/api_tests/lbaas_tests.py
View File

@ -57,7 +57,8 @@ class LbaasApiTests(test.APITestCase):
'admin_state_up': vip1['admin_state_up']
}
neutronclient.create_vip({'vip': vipform_data}).AndReturn(vipform_data)
neutronclient.create_vip({'vip': vipform_data}).AndReturn(
{'vip': vipform_data})
self.mox.ReplayAll()
form_data = dict(vipform_data)
@ -196,9 +197,9 @@ class LbaasApiTests(test.APITestCase):
api.neutron.subnet_get(self.request, subnet.id).AndReturn(subnet)
neutronclient.show_vip(pool.vip_id).AndReturn(vip_dict)
neutronclient.list_members(pool_id=pool.id).AndReturn(
{'members': self.members.list()})
{'members': self.api_members.list()})
neutronclient.list_health_monitors(id=pool.health_monitors).AndReturn(
{'health_monitors': [self.monitors.first()]})
{'health_monitors': [self.api_monitors.first()]})
self.mox.ReplayAll()
ret_val = api.lbaas.pool_get(self.request, pool.id)