From bcdec7da59ade484d370fb4a605e4f6926038252 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 25 Aug 2011 18:10:43 -0400
Subject: updated additional limits test

---
 nova/tests/api/openstack/test_limits.py | 19 +++++++++++--------
 1 file 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)
-- 
cgit