Merge "Fix a unit test for create instance"

This commit is contained in:
Jenkins 2015-09-07 08:20:26 +00:00 committed by Gerrit Code Review
commit 299b28ea66

View File

@ -2518,7 +2518,8 @@ class InstanceTests(helpers.TestCase):
@helpers.create_stubs({api.glance: ('image_list_detailed',), @helpers.create_stubs({api.glance: ('image_list_detailed',),
api.neutron: ('network_list', api.neutron: ('network_list',
'profile_list', 'profile_list',
'port_create',), 'port_create',
'port_delete'),
api.nova: ('extension_supported', api.nova: ('extension_supported',
'flavor_list', 'flavor_list',
'keypair_list', 'keypair_list',
@ -2608,6 +2609,8 @@ class InstanceTests(helpers.TestCase):
disk_config='AUTO', disk_config='AUTO',
config_drive=False) \ config_drive=False) \
.AndRaise(self.exceptions.keystone) .AndRaise(self.exceptions.keystone)
if test_with_profile:
api.neutron.port_delete(IsA(http.HttpRequest), port.id)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \ quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages) .AndReturn(quota_usages)
api.nova.flavor_list(IsA(http.HttpRequest)) \ api.nova.flavor_list(IsA(http.HttpRequest)) \