commit 121499d46aecfa14aababa08a32cf636d5b66d05
author Jenkins <jenkins@review.openstack.org> Wed Feb 27 04:26:47 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Feb 27 04:26:47 2013 +0000
tree 22da5ace7685d2014c01b88cc2f074730f1209f4
parent 6f02cefd40761a057e37082b095fdaabf9ceb388
parent 49e330611319f4096061a92b4fad61a9c482b76f

Merge "Catching new exception while disassociating a disassociated floating ip"

tempest/tests/compute/floating_ips/test_floating_ips_actions.py

diff --git a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py
index ffff1f7..0f63016 100644
--- a/tempest/tests/compute/floating_ips/test_floating_ips_actions.py
+++ b/tempest/tests/compute/floating_ips/test_floating_ips_actions.py
@@ -176,7 +176,7 @@
             self.client.disassociate_floating_ip_from_server(
                 self.floating_ip,
                 self.server_id)
-        except exceptions.NotFound:
+        except (exceptions.NotFound, exceptions.BadRequest):
             pass
         else:
             self.fail('The floating IP should be associated to the second '