Use random strings for test fixtures
Tests should use a random string so that we don't mistakenly use the wrong string and not test what we think we're testing. Change-Id: Ied0672db78a1e1cf2d390020cc5a49d0203683be
This commit is contained in:
		| @@ -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) | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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/' | ||||
|   | ||||
| @@ -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,7 +240,8 @@ class UserTests(utils.TestCase, utils.CrudTests): | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         self.assertEqual(self.TEST_URL + '/users/test/password', | ||||
|         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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Brant Knudson
					Brant Knudson