From 65abf74e1a04727942305c9ba2cf2b21817a0b8c Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Fri, 7 Feb 2014 21:35:18 +0100 Subject: [PATCH] Python3: fix test_insecure test_insecure() fails because it ends up calling guess_json_utf8() in the requests module, where the count() method of the str type is called with bytes input: nullcount = sample.count(_null) This patch makes sure that we pass 'sample' as bytes. Change-Id: I70071623d425ebbf910d3568a7b5c5d857892402 --- keystoneclient/tests/test_s3_token_middleware.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keystoneclient/tests/test_s3_token_middleware.py b/keystoneclient/tests/test_s3_token_middleware.py index 7362f84eb..064aef2da 100644 --- a/keystoneclient/tests/test_s3_token_middleware.py +++ b/keystoneclient/tests/test_s3_token_middleware.py @@ -17,6 +17,7 @@ import httpretty import mock import requests +import six import testtools import webob @@ -126,9 +127,12 @@ class S3TokenMiddlewareTestGood(S3TokenMiddlewareTestBase): self.middleware = ( s3_token.filter_factory({'insecure': True})(FakeApp())) + text_return_value = jsonutils.dumps(GOOD_RESPONSE) + if six.PY3: + text_return_value = text_return_value.encode() MOCK_REQUEST.return_value = utils.TestResponse({ 'status_code': 201, - 'text': jsonutils.dumps(GOOD_RESPONSE)}) + 'text': text_return_value}) req = webob.Request.blank('/v1/AUTH_cfa/c/o') req.headers['Authorization'] = 'access:signature'