commit 97a8447f41d30873a91ec5dc708c77352f7ea36e
author Jenkins <jenkins@review.openstack.org> Fri Jan 30 06:01:07 2015 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jan 30 06:01:07 2015 +0000
tree d9bb2014afc0c1d96c38cd72a0a3aba5c156328a
parent fc1593a04f3ca17bfe69c859ca4db8d13456a781
parent c268828f3c511d91ce55faccebf93867fd87c851

Merge "Fix FIP negative tests for nova V2.1 API"

tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py

diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py b/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py
index 2b0f268..b08df97 100644
--- a/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py
+++ b/tempest/api/compute/floating_ips/test_floating_ips_actions_negative.py
@@ -89,7 +89,7 @@
     @test.services('network')
     def test_associate_ip_to_server_without_passing_floating_ip(self):
         # Negative test:Association of empty floating IP to specific server
-        # should raise NotFound exception
-        self.assertRaises(exceptions.NotFound,
+        # should raise NotFound or BadRequest(In case of Nova V2.1) exception.
+        self.assertRaises((exceptions.NotFound, exceptions.BadRequest),
                           self.client.associate_floating_ip_to_server,
                           '', self.server_id)