From 85d1ce6e55e6bb738c98e7050d7ea54f8873cada Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Thu, 13 Mar 2014 17:45:14 +0100 Subject: [PATCH] Python 3: enable tests/unit/middleware/test_request_id.py In Python 3, webob will return bytes, so we need to fix generate_request_id() so that it also returns bytes. The behaviour is unchanged in Python 2. Change-Id: I389cf20e4c999c9bb576a42388497852f8ba27ec --- openstack/common/context.py | 2 +- tests/unit/middleware/test_request_id.py | 2 +- tox.ini | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openstack/common/context.py b/openstack/common/context.py index 09019ee38..3eeb445e4 100644 --- a/openstack/common/context.py +++ b/openstack/common/context.py @@ -25,7 +25,7 @@ import uuid def generate_request_id(): - return 'req-%s' % str(uuid.uuid4()) + return b'req-' + str(uuid.uuid4()).encode('ascii') class RequestContext(object): diff --git a/tests/unit/middleware/test_request_id.py b/tests/unit/middleware/test_request_id.py index bdd903dd1..a8bcd88a3 100644 --- a/tests/unit/middleware/test_request_id.py +++ b/tests/unit/middleware/test_request_id.py @@ -32,6 +32,6 @@ class RequestIdTest(test.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('req-')) + self.assertThat(res_req_id, matchers.StartsWith(b'req-')) # request-id in request environ is returned as response body self.assertEqual(res_req_id, res.body) diff --git a/tox.ini b/tox.ini index 817dca17b..291f0dcc7 100644 --- a/tox.ini +++ b/tox.ini @@ -69,6 +69,7 @@ commands = tests/unit/middleware/test_catch_errors.py \ tests/unit/middleware/test_correlation_id.py \ tests/unit/middleware/test_notifier.py \ + tests/unit/middleware/test_request_id.py \ tests/unit/rpc/test_dispatcher.py \ tests/unit/scheduler/test_host_filters.py \ tests/unit/test_cfgfilter.py \