openstack/python-keystoneclient
Code Issues Proposed changes

Python 3: set webob.Response().body to a bytes value

Browse Source 
In Python 3, the body attribute of a webob.Response instance has type 'bytes':

    >>> import webob
    >>> type(webob.Response().body)
    <class 'bytes'>

Change-Id: Ic60454dd1713ebd5ae84daaa113ccb0270ca37ed
This commit is contained in:
Cyril Roelandt
2014-01-17 21:21:56 +01:00
parent 19d0396224
commit 536f3288a7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -188,6 +188,8 @@ class FakeSwiftOldMemcacheClient(memorycache.Client):
class FakeApp(object): class FakeApp(object):
"""This represents a WSGI app protected by the auth_token middleware.""" """This represents a WSGI app protected by the auth_token middleware."""
SUCCESS = b'SUCCESS'
def __init__(self, expected_env=None): def __init__(self, expected_env=None):
self.expected_env = dict(EXPECTED_V2_DEFAULT_ENV_RESPONSE) self.expected_env = dict(EXPECTED_V2_DEFAULT_ENV_RESPONSE)
@@ -199,7 +201,7 @@ class FakeApp(object):
assert env[k] == v, '%s != %s' % (env[k], v) assert env[k] == v, '%s != %s' % (env[k], v)
resp = webob.Response() resp = webob.Response()
resp.body = 'SUCCESS' resp.body = FakeApp.SUCCESS
return resp(env, start_response) return resp(env, start_response)
@@ -465,7 +467,7 @@ class CommonAuthTokenMiddlewareTest(object):
self.assertTrue(req.headers.get('X-Service-Catalog')) self.assertTrue(req.headers.get('X-Service-Catalog'))
else: else:
self.assertNotIn('X-Service-Catalog', req.headers) self.assertNotIn('X-Service-Catalog', req.headers)
self.assertEqual(body, ['SUCCESS']) self.assertEqual(body, [FakeApp.SUCCESS])
self.assertIn('keystone.token_info', req.environ) self.assertIn('keystone.token_info', req.environ)
def test_valid_uuid_request(self): def test_valid_uuid_request(self):
@@ -933,7 +935,7 @@ class CommonAuthTokenMiddlewareTest(object):
if success: if success:
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertEqual(body, ['SUCCESS']) self.assertEqual(body, [FakeApp.SUCCESS])
self.assertIn('keystone.token_info', req.environ) self.assertIn('keystone.token_info', req.environ)
self.assert_valid_last_url(token) self.assert_valid_last_url(token)
else: else:
@@ -1271,7 +1273,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
req.headers['X-Auth-Token'] = token req.headers['X-Auth-Token'] = token
body = self.middleware(req.environ, self.start_fake_response) body = self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertEqual(body, ['SUCCESS']) self.assertEqual(body, [FakeApp.SUCCESS])
self.assertIn('keystone.token_info', req.environ) self.assertIn('keystone.token_info', req.environ)
def assert_valid_last_url(self, token_id): def assert_valid_last_url(self, token_id):
@@ -1310,7 +1312,7 @@ class v2AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
body = self.middleware(req.environ, self.start_fake_response) body = self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertFalse(req.headers.get('X-Service-Catalog')) self.assertFalse(req.headers.get('X-Service-Catalog'))
self.assertEqual(body, ['SUCCESS']) self.assertEqual(body, [FakeApp.SUCCESS])
class CrossVersionAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest, class CrossVersionAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,