Merge "Additional extensions no longer break unit-tests"

1 files changed, 5 insertions, 11 deletions

diff --git a/nova/tests/api/openstack/compute/test_extensions.py b/nova/tests/api/openstack/compute/test_extensions.py
index 8fafd4e64..88abf0b35 100644
--- a/nova/tests/api/openstack/compute/test_extensions.py
+++ b/nova/tests/api/openstack/compute/test_extensions.py
@@ -195,12 +195,11 @@ class ExtensionControllerTest(ExtensionTestCase):
         response = request.get_response(app)
         self.assertEqual(200, response.status_int)
 
-        # Make sure we have all the extensions.
+        # Make sure we have all the extensions, extra extensions being OK.
         data = json.loads(response.body)
-        names = [str(x['name']) for x in data['extensions']]
+        names = [str(x['name']) for x in data['extensions']
+                 if str(x['name']) in self.ext_list]
         names.sort()
-        print names
-        print self.ext_list
         self.assertEqual(names, self.ext_list)
 
         # Make sure that at least Fox in Sox is correct.
@@ -250,14 +249,13 @@ class ExtensionControllerTest(ExtensionTestCase):
         request.accept = "application/xml"
         response = request.get_response(app)
         self.assertEqual(200, response.status_int)
-        print response.body
 
         root = etree.XML(response.body)
         self.assertEqual(root.tag.split('extensions')[0], NS)
 
-        # Make sure we have all the extensions.
+        # Make sure we have all the extensions, extras extensions being OK.
         exts = root.findall('{0}extension'.format(NS))
-        self.assertEqual(len(exts), len(self.ext_list))
+        self.assert_(len(exts) >= len(self.ext_list))
 
         # Make sure that at least Fox in Sox is correct.
         (fox_ext, ) = [x for x in exts if x.get('alias') == 'FOXNSOX']
@@ -277,7 +275,6 @@ class ExtensionControllerTest(ExtensionTestCase):
         response = request.get_response(app)
         self.assertEqual(200, response.status_int)
         xml = response.body
-        print xml
 
         root = etree.XML(xml)
         self.assertEqual(root.tag.split('extension')[0], NS)
@@ -474,7 +471,6 @@ class RequestExtensionTest(ExtensionTestCase):
         response = request.get_response(app)
         self.assertEqual(200, response.status_int)
         response_data = json.loads(response.body)
-        print response_data
         self.assertEqual('newblue', response_data['flavor']['googoose'])
         self.assertEqual("Pig Bands!", response_data['big_bands'])
 
@@ -575,7 +571,6 @@ class ExtensionsXMLSerializerTest(test.TestCase):
                      'href': 'http://docs.rack.com/servers/api/ext/cs.wadl'}]}}
 
         xml = serializer.serialize(data)
-        print xml
         root = etree.XML(xml)
         ext_dict = data['extension']
         self.assertEqual(root.findtext('{0}description'.format(NS)),
@@ -620,7 +615,6 @@ class ExtensionsXMLSerializerTest(test.TestCase):
                              "href": "http://foo.com/api/ext/cs-cbs.wadl"}]}]}
 
         xml = serializer.serialize(data)
-        print xml
         root = etree.XML(xml)
         ext_elems = root.findall('{0}extension'.format(NS))
         self.assertEqual(len(ext_elems), 2)