summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-05-17 15:14:52 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-05-17 15:14:52 -0400
commit7ab16489276daa2ec6f51fea6ec24cc0c46a8e14 (patch)
tree41aaad6b1fc0230515f13ef39d4679b2285efa3c /nova/tests
parent6fc708b463e47de560fe388ada0639eb2b2383d5 (diff)
Changed builder to match specs and added test
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_limits.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py
index 2689c7a24..c8a7dd7f2 100644
--- a/nova/tests/api/openstack/test_limits.py
+++ b/nova/tests/api/openstack/test_limits.py
@@ -199,6 +199,9 @@ class LimitsControllerV11Test(BaseLimitTestSuite):
5, 60).display(),
]
request.environ["nova.limits"] = _limits
+ #set absolute limits here
+ limits.TEST_ABSOLUTE_LIMITS = {"ram": 512, "instances": 5}
+
return request
def test_empty_index_json(self):
@@ -208,7 +211,7 @@ class LimitsControllerV11Test(BaseLimitTestSuite):
expected = {
"limits": {
"rate": [],
- "absolute": [],
+ "absolute": {},
},
}
body = json.loads(response.body)
@@ -257,7 +260,10 @@ class LimitsControllerV11Test(BaseLimitTestSuite):
},
],
- "absolute": [],
+ "absolute": {
+ "maxTotalRAMSize": 512,
+ "maxTotalInstances": 5,
+ },
},
}
body = json.loads(response.body)