openstack
/
horizon
Code Issues Proposed changes

Merge "Correct return values of mocked methods in LBaaS API test"

This commit is contained in:
Jenkins 2014-08-25 10:13:42 +00:00 committed by Gerrit Code Review
parent b2b6b34968 d83d6fe8e3
commit 88b8eee9f3
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)