commit cbf87aff207d76c106e5a53644a6f4f69b355cf2
author Jenkins <jenkins@review.openstack.org> Tue Nov 25 04:58:49 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 25 04:58:49 2014 +0000
tree d6cbac44f5c29f5299ac832409ba53fcbdf007e0
parent 9981e16846fdfbae294e31d565e215ad4f0a70bd
parent 25eac026a4447e786150f509c93f3c9d19fad272

Merge "Add Conflict exception in test_floating_ips_actions case"

tempest/api/compute/floating_ips/test_floating_ips_actions.py

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)