From 75ef563099133efd47a97c7e989d0188a054eebc Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 25 Aug 2011 17:10:35 -0400
Subject: Fixed integrated.test_xml to be more robust

---
 nova/tests/integrated/test_xml.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nova/tests/integrated/test_xml.py b/nova/tests/integrated/test_xml.py
index 6b4f4c0ec..cf013da1d 100644
--- a/nova/tests/integrated/test_xml.py
+++ b/nova/tests/integrated/test_xml.py
@@ -15,6 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from lxml import etree
+
 from nova.log import logging
 from nova.tests.integrated import integrated_helpers
 from nova.api.openstack import common
@@ -34,9 +36,8 @@ class XmlTests(integrated_helpers._IntegratedTestBase):
         response = self.api.api_request('/limits', headers=headers)
         data = response.read()
         LOG.debug("data: %s" % data)
-        declaration = "<?xml version='1.0' encoding='UTF-8'?>"
-        prefix = '%s<limits xmlns="%s"' % (declaration, common.XML_NS_V11)
-        self.assertTrue(data.startswith(prefix))
+        root = etree.XML(data)
+        self.assertEqual(root.nsmap.get(None), common.XML_NS_V11)
 
     def test_namespace_servers(self):
         """/servers should have v1.1 namespace (has changed in 1.1)."""
@@ -46,7 +47,5 @@ class XmlTests(integrated_helpers._IntegratedTestBase):
         response = self.api.api_request('/servers', headers=headers)
         data = response.read()
         LOG.debug("data: %s" % data)
-
-        declaration = "<?xml version='1.0' encoding='UTF-8'?>"
-        prefix = '%s<servers xmlns="%s"' % (declaration, common.XML_NS_V11)
-        self.assertTrue(data.startswith(prefix))
+        root = etree.XML(data)
+        self.assertEqual(root.nsmap.get(None), common.XML_NS_V11)
-- 
cgit