openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Use random strings for test fixtures"

Browse Source
This commit is contained in:
Jenkins
2015-06-09 20:38:41 +00:00
committed by Gerrit Code Review
parent c0046d7d01 945e5195e8
commit 53391c190e
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/tests/unit/auth/test_identity_v3.py
View File

@@ -245,7 +245,7 @@ class V3IdentityPlugin(utils.TestCase):
self.stub_auth(json=self.TEST_RESPONSE_DICT)
a = v3.Password(self.TEST_URL, username=self.TEST_USER,
password=self.TEST_PASS,
project_id=self.TEST_DOMAIN_ID)
project_id=self.TEST_TENANT_ID)
s = session.Session(a)
self.assertEqual({'X-Auth-Token': self.TEST_TOKEN},
@@ -255,10 +255,10 @@ class V3IdentityPlugin(utils.TestCase):
{'methods': ['password'],
'password': {'user': {'name': self.TEST_USER,
'password': self.TEST_PASS}}},
'scope': {'project': {'id': self.TEST_DOMAIN_ID}}}}
'scope': {'project': {'id': self.TEST_TENANT_ID}}}}
self.assertRequestBodyIs(json=req)
self.assertEqual(s.auth.auth_ref.auth_token, self.TEST_TOKEN)
self.assertEqual(s.auth.auth_ref.project_id, self.TEST_DOMAIN_ID)
self.assertEqual(s.auth.auth_ref.project_id, self.TEST_TENANT_ID)
def test_authenticate_with_token(self):
self.stub_auth(json=self.TEST_RESPONSE_DICT)

4
keystoneclient/tests/unit/test_session.py
View File

@@ -364,7 +364,7 @@ class AuthPlugin(base.BaseAuthPlugin):
Takes Parameters such that it can throw exceptions at the right times.
"""
TEST_TOKEN = 'aToken'
TEST_TOKEN = utils.TestCase.TEST_TOKEN
TEST_USER_ID = 'aUser'
TEST_PROJECT_ID = 'aProject'
@@ -414,7 +414,7 @@ class CalledAuthPlugin(base.BaseAuthPlugin):
def get_token(self, session):
self.get_token_called = True
return 'aToken'
return utils.TestCase.TEST_TOKEN
def get_endpoint(self, session, **kwargs):
self.get_endpoint_called = True

14
keystoneclient/tests/unit/utils.py
View File

@@ -28,15 +28,15 @@ import testtools
class TestCase(testtools.TestCase):
TEST_DOMAIN_ID = '1'
TEST_DOMAIN_NAME = 'aDomain'
TEST_DOMAIN_ID = uuid.uuid4().hex
TEST_DOMAIN_NAME = uuid.uuid4().hex
TEST_GROUP_ID = uuid.uuid4().hex
TEST_ROLE_ID = uuid.uuid4().hex
TEST_TENANT_ID = '1'
TEST_TENANT_NAME = 'aTenant'
TEST_TOKEN = 'aToken'
TEST_TRUST_ID = 'aTrust'
TEST_USER = 'test'
TEST_TENANT_ID = uuid.uuid4().hex
TEST_TENANT_NAME = uuid.uuid4().hex
TEST_TOKEN = uuid.uuid4().hex
TEST_TRUST_ID = uuid.uuid4().hex
TEST_USER = uuid.uuid4().hex
TEST_USER_ID = uuid.uuid4().hex
TEST_ROOT_URL = 'http://127.0.0.1:5000/'

9
keystoneclient/tests/unit/v3/test_users.py
View File

@@ -230,8 +230,8 @@ class UserTests(utils.TestCase, utils.CrudTests):
new_password = uuid.uuid4().hex
self.stub_url('POST',
[self.collection_key, self.TEST_USER, 'password'])
self.client.user_id = self.TEST_USER
[self.collection_key, self.TEST_USER_ID, 'password'])
self.client.user_id = self.TEST_USER_ID
self.manager.update_password(old_password, new_password)
exp_req_body = {
@@ -240,8 +240,9 @@ class UserTests(utils.TestCase, utils.CrudTests):
}
}
self.assertEqual(self.TEST_URL + '/users/test/password',
self.requests_mock.last_request.url)
self.assertEqual(
'%s/users/%s/password' % (self.TEST_URL, self.TEST_USER_ID),
self.requests_mock.last_request.url)
self.assertRequestBodyIs(json=exp_req_body)
self.assertNotIn(old_password, self.logger.output)
self.assertNotIn(new_password, self.logger.output)