summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-08-25 18:10:43 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-08-25 18:10:43 -0400
commitbcdec7da59ade484d370fb4a605e4f6926038252 (patch)
tree0e8d9986d52876bfd13299bd434303b0775d4442
parentbebc02efbf4f049efeb4e1f72a21a8fdc825903a (diff)
updated additional limits test
-rw-r--r--nova/tests/api/openstack/test_limits.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/test_limits.py b/nova/tests/api/openstack/test_limits.py
index 888f62697..250d97101 100644
--- a/nova/tests/api/openstack/test_limits.py
+++ b/nova/tests/api/openstack/test_limits.py
@@ -1046,13 +1046,16 @@ class LimitsXMLSerializationTest(test.TestCase):
"absolute": {}}}
output = serializer.serialize(fixture, 'index')
- actual = minidom.parseString(output.replace(" ", ""))
+ print output
+ root = etree.XML(output)
+ xmlutil.validate_schema(root, 'limits')
- expected = minidom.parseString("""
- <limits xmlns="http://docs.openstack.org/compute/api/v1.1">
- <rates />
- <absolute />
- </limits>
- """.replace(" ", ""))
+ #verify absolute limits
+ absolute = root.find('{0}absolute'.format(NS))
+ absolutes = absolute.findall('limit'.format(NS))
+ self.assertEqual(len(absolutes), 0)
- self.assertEqual(expected.toxml(), actual.toxml())
+ #verify rate limits
+ rate_root = root.find('{0}rates'.format(NS))
+ rates = rate_root.findall('{0}rate'.format(NS))
+ self.assertEqual(len(rates), 0)