openstack/glance
Code Issues Proposed changes

Merge "Support Unicode request_id on Python 3"

Browse Source
This commit is contained in:
Jenkins 2015-11-29 16:08:28 +00:00 committed by Gerrit Code Review
commit 0abc79c235
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glance/tests/unit/test_context_middleware.py
View File

@ -129,8 +129,10 @@ class TestContextMiddleware(base.IsolatedUnitTest):
self.assertEqual(request_id, resp.headers['x-openstack-request-id']) self.assertEqual(request_id, resp.headers['x-openstack-request-id'])
resp_req_id = resp.headers['x-openstack-request-id'] resp_req_id = resp.headers['x-openstack-request-id']
# Validate that request-id do not starts with 'req-req-' # Validate that request-id do not starts with 'req-req-'
self.assertFalse(resp_req_id.startswith(b'req-req-')) if isinstance(resp_req_id, bytes):
self.assertTrue(resp_req_id.startswith(b'req-')) resp_req_id = resp_req_id.decode('utf-8')
self.assertFalse(resp_req_id.startswith('req-req-'))
self.assertTrue(resp_req_id.startswith('req-'))
class TestUnauthenticatedContextMiddleware(base.IsolatedUnitTest): class TestUnauthenticatedContextMiddleware(base.IsolatedUnitTest):
@ -155,6 +157,8 @@ class TestUnauthenticatedContextMiddleware(base.IsolatedUnitTest):
middleware.process_response(resp) middleware.process_response(resp)
self.assertEqual(request_id, resp.headers['x-openstack-request-id']) self.assertEqual(request_id, resp.headers['x-openstack-request-id'])
resp_req_id = resp.headers['x-openstack-request-id'] resp_req_id = resp.headers['x-openstack-request-id']
if isinstance(resp_req_id, bytes):
resp_req_id = resp_req_id.decode('utf-8')
# Validate that request-id do not starts with 'req-req-' # Validate that request-id do not starts with 'req-req-'
self.assertFalse(resp_req_id.startswith(b'req-req-')) self.assertFalse(resp_req_id.startswith('req-req-'))
self.assertTrue(resp_req_id.startswith(b'req-')) self.assertTrue(resp_req_id.startswith('req-'))