diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | tests/unit/extensions/foxinsocks.py | 4 | ||||
| -rw-r--r-- | tests/unit/test_wsgi.py | 22 |
3 files changed, 18 insertions, 9 deletions
@@ -1,6 +1,7 @@ *.swp *.pyc *.log +.coverage .openstack-common-venv/ skeleton.egg-info/ build/ diff --git a/tests/unit/extensions/foxinsocks.py b/tests/unit/extensions/foxinsocks.py index a0efd7e..b2fd656 100644 --- a/tests/unit/extensions/foxinsocks.py +++ b/tests/unit/extensions/foxinsocks.py @@ -18,7 +18,6 @@ import json from openstack.common import extensions -from openstack.common import wsgi class FoxInSocksController(object): @@ -26,9 +25,6 @@ class FoxInSocksController(object): def index(self, request): return "Try to say this Mr. Knox, sir..." - def create_resource(self): - return wsgi.Resource(self) - class Foxinsocks(object): diff --git a/tests/unit/test_wsgi.py b/tests/unit/test_wsgi.py index 7a5eaa4..10af93c 100644 --- a/tests/unit/test_wsgi.py +++ b/tests/unit/test_wsgi.py @@ -275,7 +275,7 @@ class ResponseSerializerTest(unittest.TestCase): self.body_serializers = { 'application/json': JSONSerializer(), - 'application/XML': XMLSerializer(), + 'application/xml': XMLSerializer(), } self.serializer = wsgi.ResponseSerializer(self.body_serializers, @@ -294,12 +294,18 @@ class ResponseSerializerTest(unittest.TestCase): self.serializer.get_body_serializer, 'application/unknown') - def test_serialize_response(self): + def test_serialize_json_response(self): response = self.serializer.serialize({}, 'application/json') self.assertEqual(response.headers['Content-Type'], 'application/json') self.assertEqual(response.body, 'pew_json') self.assertEqual(response.status_int, 404) + def test_serialize_xml_response(self): + response = self.serializer.serialize({}, 'application/xml') + self.assertEqual(response.headers['Content-Type'], 'application/xml') + self.assertEqual(response.body, 'pew_xml') + self.assertEqual(response.status_int, 404) + def test_serialize_response_None(self): response = self.serializer.serialize(None, 'application/json') @@ -326,14 +332,20 @@ class RequestDeserializerTest(unittest.TestCase): self.body_deserializers = { 'application/json': JSONDeserializer(), - 'application/XML': XMLDeserializer(), + 'application/xml': XMLDeserializer(), } self.deserializer = wsgi.RequestDeserializer(self.body_deserializers) def test_get_deserializer(self): - expected = self.deserializer.get_body_deserializer('application/json') - self.assertEqual(expected, self.body_deserializers['application/json']) + expected_json_serializer = self.deserializer.get_body_deserializer( + 'application/json') + expected_xml_serializer = self.deserializer.get_body_deserializer( + 'application/xml') + self.assertEqual(expected_json_serializer, + self.body_deserializers['application/json']) + self.assertEqual(expected_xml_serializer, + self.body_deserializers['application/xml']) def test_get_deserializer_unknown_content_type(self): self.assertRaises(exception.InvalidContentType, |