| commit | 25eac026a4447e786150f509c93f3c9d19fad272 | [log] [tgz] |
|---|---|---|
| author | Eli Qiao <taget@linux.vnet.ibm.com> | Tue Oct 28 16:24:11 2014 +0800 |
| committer | Eli Qiao <taget@linux.vnet.ibm.com> | Thu Nov 20 10:56:41 2014 +0800 |
| tree | 990497c9eafc9cc4bd7ac169100122106fca0cc0 | |
| parent | b19fb633b3acc5bd9520529dc64033b80bdffc2e [diff] |
Add Conflict exception in test_floating_ips_actions case We modify the error return code in nova api both v2 and v2.1, so we need to reflect this to tempest test cases test_associate_already_associated_floating_ip changes : add HTTPConflict Nove review link: https://review.openstack.org/#/c/127889/ Change-Id: Icbb7b0aa46c864993290749e9a6711f3fa224255
diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions.py b/tempest/api/compute/floating_ips/test_floating_ips_actions.py index ba66ab9..3bb7d19 100644 --- a/tempest/api/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/api/compute/floating_ips/test_floating_ips_actions.py
@@ -130,7 +130,8 @@ # Make sure no longer associated with old server self.assertRaises((exceptions.NotFound, - exceptions.UnprocessableEntity), + exceptions.UnprocessableEntity, + exceptions.Conflict), self.client.disassociate_floating_ip_from_server, self.floating_ip, self.server_id)