openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Use assertIn where appropriate"

Browse Source
This commit is contained in:
Jenkins
2013-12-05 16:11:18 +00:00
committed by Gerrit Code Review
parent 49becbc017 b51cae6066
commit 87769ee456
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -390,7 +390,7 @@ class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
req.headers['X-Auth-Token'] = self.token_id req.headers['X-Auth-Token'] = self.token_id
self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertEqual(self.response_status, 200) self.assertEqual(self.response_status, 200)
self.assertTrue('keystone.token_info' in req.environ) self.assertIn('keystone.token_info', req.environ)
class NoMemcacheAuthToken(BaseAuthTokenMiddlewareTest): class NoMemcacheAuthToken(BaseAuthTokenMiddlewareTest):
@@ -450,7 +450,7 @@ class CommonAuthTokenMiddlewareTest(object):
else: else:
self.assertNotIn('X-Service-Catalog', req.headers) self.assertNotIn('X-Service-Catalog', req.headers)
self.assertEqual(body, ['SUCCESS']) self.assertEqual(body, ['SUCCESS'])
self.assertTrue('keystone.token_info' in req.environ) self.assertIn('keystone.token_info', req.environ)
def test_valid_uuid_request(self): def test_valid_uuid_request(self):
self.assert_valid_request_200(self.token_dict['uuid_token_default']) self.assert_valid_request_200(self.token_dict['uuid_token_default'])
@@ -1081,7 +1081,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.assertEqual(body, ['SUCCESS']) self.assertEqual(body, ['SUCCESS'])
self.assertTrue('keystone.token_info' in 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):
self.assertLastPath("/testadmin/v2.0/tokens/%s" % token_id) self.assertLastPath("/testadmin/v2.0/tokens/%s" % token_id)