summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorPádraig Brady <pbrady@redhat.com>2012-06-05 14:33:43 +0100
committerPádraig Brady <pbrady@redhat.com>2012-06-05 18:23:14 +0100
commit84969afb3bfd467a2f48cf030a325c1a2fcd13ca (patch)
treec95d9f57753cb37c7388e960e15a53613a0ce097 /nova/tests
parent1334ce8755c775c963aa98a6d43e521fb641a569 (diff)
fix the instance quota overlimit message
This addresses two closely related bugs. Bug: 998199 Fix the "used" and "total" counts in the returned diagnostic. Bug: 902218 Itemize instance quota items exceeded, in the returned diagnostic. Change-Id: Iff7781a7fb53545d44c2b4ec0ca6d65114723c8d
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/compute/test_servers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index f9e815c20..44741596b 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -2348,7 +2348,8 @@ class ServersControllerCreateTest(test.TestCase):
self.fail('expected quota to be exceeded')
except webob.exc.HTTPRequestEntityTooLarge as e:
self.assertEquals(e.explanation,
- _('Quota exceeded: already used 1 of 1 instances'))
+ _('Quota exceeded for instances: Requested 1, but'
+ ' already used 0 of 0 instances'))
class TestServerCreateRequestXMLDeserializer(test.TestCase):