diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-16 20:18:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-16 20:18:20 +0000 |
| commit | b32f460c6023a852cc6fa34c73bec1585ede3d36 (patch) | |
| tree | 63c4dcc4e57d53860f0ed792a32bea3d65721e6e /nova/tests | |
| parent | 95e69b307b7dd1296055a24cdba8c72525950146 (diff) | |
| parent | e022ea9bb44cd49b45e6d4b82dd168000988dc20 (diff) | |
Merge "Update some extensions (2)"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/test_wsgi.py | 6 |
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): |