From 086494bac46328659e3d7e71315096ec1a96ca88 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 27 Nov 2015 16:42:43 +0100 Subject: Support Unicode request_id on Python 3 The oslo.context change If48ee7f4d1c113f1f26b3b1698c6b055807b950f will change request_id type on Python 3 from bytes to str. This change prepares Neutron for this change. Change-Id: I872c268ef5f17dc2c1fe0ce8aa7e8af4ebc1d757 (cherry picked from commit 5c06fa6ea71cf9cd6526c1469dc6e12ab80a3fa1) --- oslo_middleware/tests/test_request_id.py | 6 ++++-- tests/test_request_id.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/oslo_middleware/tests/test_request_id.py b/oslo_middleware/tests/test_request_id.py index 09bdd32..76f3696 100644 --- a/oslo_middleware/tests/test_request_id.py +++ b/oslo_middleware/tests/test_request_id.py @@ -32,6 +32,8 @@ class RequestIdTest(test_base.BaseTestCase): req = webob.Request.blank('/test') res = req.get_response(app) res_req_id = res.headers.get(request_id.HTTP_RESP_HEADER_REQUEST_ID) - self.assertThat(res_req_id, matchers.StartsWith(b'req-')) + if isinstance(res_req_id, bytes): + res_req_id = res_req_id.decode('utf-8') + self.assertThat(res_req_id, matchers.StartsWith('req-')) # request-id in request environ is returned as response body - self.assertEqual(res_req_id, res.body) + self.assertEqual(res_req_id, res.body.decode('utf-8')) diff --git a/tests/test_request_id.py b/tests/test_request_id.py index 549d7be..263016d 100644 --- a/tests/test_request_id.py +++ b/tests/test_request_id.py @@ -32,6 +32,8 @@ class RequestIdTest(test_base.BaseTestCase): req = webob.Request.blank('/test') res = req.get_response(app) res_req_id = res.headers.get(request_id.HTTP_RESP_HEADER_REQUEST_ID) - self.assertThat(res_req_id, matchers.StartsWith(b'req-')) + if isinstance(res_req_id, bytes): + res_req_id = res_req_id.decode('utf-8') + self.assertThat(res_req_id, matchers.StartsWith('req-')) # request-id in request environ is returned as response body - self.assertEqual(res_req_id, res.body) + self.assertEqual(res_req_id, res.body.decode('utf-8')) -- cgit v1.2.1