openstack
/
keystone
Code Issues Proposed changes

Merge "Fix misused assertTrue in unit tests"

This commit is contained in:
Jenkins 2013-09-17 21:20:29 +00:00 committed by Gerrit Code Review
parent fb6b5eba63 e72c273d46
commit d3460c3719
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/tests/test_middleware.py
View File

@ -149,7 +149,7 @@ class XmlBodyMiddlewareTest(tests.TestCase):
content_type='application/xml',
method='POST')
middleware.XmlBodyMiddleware(None).process_request(req)
self.assertTrue(req.content_type, 'application/json')
self.assertEqual(req.content_type, 'application/json')
self.assertTrue(jsonutils.loads(req.body))
def test_json_unnaffected(self):

8
keystone/tests/test_v3_oauth1.py
View File

@ -147,7 +147,7 @@ class ConsumerCRUDTests(OAuth1Tests):
consumer_id = consumer.get('id')
resp = self.get('/OS-OAUTH1/consumers/%(consumer_id)s'
% {'consumer_id': consumer_id})
self.assertTrue(resp.result.get('consumer').get('id'), consumer_id)
self.assertEqual(resp.result.get('consumer').get('id'), consumer_id)
def test_consumer_list(self):
resp = self.get('/OS-OAUTH1/consumers')
@ -269,8 +269,8 @@ class AccessTokenCRUDTests(OAuthFlowTests):
% {'user_id': self.user_id,
'key': self.access_token.key})
entity = resp.result.get('access_token')
self.assertTrue(entity['id'], self.access_token.key)
self.assertTrue(entity['consumer_id'], self.consumer.key)
self.assertEqual(entity['id'], self.access_token.key)
self.assertEqual(entity['consumer_id'], self.consumer.key)
def test_get_access_token_dne(self):
self.get('/users/%(user_id)s/OS-OAUTH1/access_tokens/%(key)s'
@ -294,7 +294,7 @@ class AccessTokenCRUDTests(OAuthFlowTests):
'role': self.role_id})
resp = self.get(url)
entity = resp.result.get('role')
self.assertTrue(entity['id'], self.role_id)
self.assertEqual(entity['id'], self.role_id)
def test_get_role_in_access_token_dne(self):
self.test_oauth_flow()