summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-01-16 11:31:56 -0600
committerKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-01-16 11:31:56 -0600
commite022ea9bb44cd49b45e6d4b82dd168000988dc20 (patch)
tree9bba4ee2fb791fe123dc9d5013403b4c760f35be /nova/tests
parent312caea8ab278882552cf9006653de97ced88ef8 (diff)
Update some extensions (2)
Updates the extended_status (ExtendedStatus) extension to conform to the new extension interface. Related to blueprint extension-refactor. Change-Id: Ie00968c4cdcd67a2cf659a2b8c2ca2b31e8dcc9d
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/test_wsgi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py
index 534ae7e2c..8807c9128 100644
--- a/nova/tests/api/openstack/test_wsgi.py
+++ b/nova/tests/api/openstack/test_wsgi.py
@@ -993,7 +993,7 @@ class ResponseObjectTest(test.TestCase):
def test_get_serializer(self):
robj = wsgi.ResponseObject({}, json='json', xml='xml', atom='atom')
for content_type, mtype in wsgi._MEDIA_TYPE_MAP.items():
- serializer = robj.get_serializer(content_type)
+ _mtype, serializer = robj.get_serializer(content_type)
self.assertEqual(serializer, mtype)
def test_get_serializer_defaults(self):
@@ -1002,8 +1002,8 @@ class ResponseObjectTest(test.TestCase):
for content_type, mtype in wsgi._MEDIA_TYPE_MAP.items():
self.assertRaises(exception.InvalidContentType,
robj.get_serializer, content_type)
- serializer = robj.get_serializer(content_type,
- default_serializers)
+ _mtype, serializer = robj.get_serializer(content_type,
+ default_serializers)
self.assertEqual(serializer, mtype)
def test_serialize(self):