openstack
/
glance
Code Issues Proposed changes

Port test_wsgi to Python 3 

* Replace filter() with list-comprehension to get a list on Python 3.
* HTTP body type is bytes: use byte strings for body.

Change-Id: Ia7fba4b075cdedd4581e4e8503f5220c1e6198d7
This commit is contained in:
Victor Stinner 2015-10-19 19:18:20 +02:00
parent b9aaa2f39e
commit ea2673e1c5
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glance/tests/unit/common/test_wsgi.py
View File

@ -406,11 +406,11 @@ class JSONResponseSerializerTest(test_utils.BaseTestCase):
response = webob.Response()
wsgi.JSONResponseSerializer().default(response, fixture)
self.assertEqual(200, response.status_int)
content_types = filter(lambda h: h[0] == 'Content-Type',
response.headerlist)
content_types = [h for h in response.headerlist
if h[0] == 'Content-Type']
self.assertEqual(1, len(content_types))
self.assertEqual('application/json', response.content_type)
self.assertEqual('{"key": "value"}', response.body)
self.assertEqual(b'{"key": "value"}', response.body)
class JSONRequestDeserializerTest(test_utils.BaseTestCase):
@ -418,21 +418,21 @@ class JSONRequestDeserializerTest(test_utils.BaseTestCase):
def test_has_body_no_content_length(self):
request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf'
request.body = b'asdf'
request.headers.pop('Content-Length')
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_zero_content_length(self):
request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf'
request.body = b'asdf'
request.headers['Content-Length'] = 0
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_has_content_length(self):
request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf'
request.body = b'asdf'
self.assertIn('Content-Length', request.headers)
self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
@ -460,7 +460,7 @@ class JSONRequestDeserializerTest(test_utils.BaseTestCase):
def test_default_with_body(self):
request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = '{"key": "value"}'
request.body = b'{"key": "value"}'
actual = wsgi.JSONRequestDeserializer().default(request)
expected = {"body": {"key": "value"}}
self.assertEqual(expected, actual)
@ -489,7 +489,7 @@ class JSONRequestDeserializerTest(test_utils.BaseTestCase):
content_length=None):
request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'fake_body'
request.body = b'fake_body'
request.headers['transfer-encoding'] = transfer_encoding
if content_length is not None:
request.headers['content-length'] = content_length

1
tox.ini
View File

@ -37,6 +37,7 @@ commands =
glance.tests.unit.common.test_semver \
glance.tests.unit.common.test_swift_store_utils \
glance.tests.unit.common.test_utils \
glance.tests.unit.common.test_wsgi \
glance.tests.unit.common.test_wsgi_ipv6 \
glance.tests.unit.test_artifact_type_definition_framework \
glance.tests.unit.test_artifacts_plugin_loader \