summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-24 11:16:22 +0000
committerGerrit Code Review <review@openstack.org>2015-09-24 11:16:22 +0000
commitb55acddc1590095973f7814eb9d06ea7d5b784f7 (patch)
tree78eb937ce18fb831ce258be8c1fd625519839d1b
parent8811f8f1026c3ed1343847162eaf3c50dbca1778 (diff)
parentd6be3061cd36fbf50d973329da742c6080a4b7e2 (diff)
downloadhorizon-b55acddc1590095973f7814eb9d06ea7d5b784f7.tar.gz
Merge "Fix a unit test for create instance" into stable/kilo
-rw-r--r--openstack_dashboard/dashboards/project/instances/tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py
index af9d4be1f..36ea1f69f 100644
--- a/openstack_dashboard/dashboards/project/instances/tests.py
+++ b/openstack_dashboard/dashboards/project/instances/tests.py
@@ -2465,7 +2465,8 @@ class InstanceTests(helpers.TestCase):
@helpers.create_stubs({api.glance: ('image_list_detailed',),
api.neutron: ('network_list',
'profile_list',
- 'port_create',),
+ 'port_create',
+ 'port_delete'),
api.nova: ('extension_supported',
'flavor_list',
'keypair_list',
@@ -2555,6 +2556,8 @@ class InstanceTests(helpers.TestCase):
disk_config='AUTO',
config_drive=False) \
.AndRaise(self.exceptions.keystone)
+ if test_with_profile:
+ api.neutron.port_delete(IsA(http.HttpRequest), port.id)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
api.nova.flavor_list(IsA(http.HttpRequest)) \