summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-13 16:12:01 +0000
committerGerrit Code Review <review@openstack.org>2012-07-13 16:12:01 +0000
commitcbeb9457ddb43d12d44fc07bd64d8dce2abdbcd6 (patch)
tree0937f984c36f7be984e3ccf0ce83bd811a11468a /nova/tests
parent03de59d976e1c2e821ebfa2ee8933083c92a27e6 (diff)
parentb0da2c4f4ed492f11c343852442e447073a5af76 (diff)
Merge "When over quota for floating ips, return HTTPRequestEntityTooLarge."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_floating_ips.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
index 6ce0daa05..e1a5593d3 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py
@@ -228,7 +228,8 @@ class FloatingIpTest(test.TestCase):
self.stubs.Set(rpc, "call", fake_call)
req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips')
- self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
+ self.assertRaises(webob.exc.HTTPRequestEntityTooLarge,
+ self.controller.create,
req)
def test_floating_ip_allocate(self):