diff options
Diffstat (limited to 'tempest')
22 files changed, 151 insertions, 151 deletions
diff --git a/tempest/api/identity/admin/v2/test_roles.py b/tempest/api/identity/admin/v2/test_roles.py index dd5164d4d..b3746f291 100644 --- a/tempest/api/identity/admin/v2/test_roles.py +++ b/tempest/api/identity/admin/v2/test_roles.py @@ -26,7 +26,7 @@ class RolesTestJSON(base.BaseIdentityV2AdminTest): def resource_setup(cls): super(RolesTestJSON, cls).resource_setup() for _ in moves.xrange(5): - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') role = cls.client.create_role(role_name) cls.data.roles.append(role) @@ -58,7 +58,7 @@ class RolesTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('c62d909d-6c21-48c0-ae40-0a0760e6db5e') def test_role_create_delete(self): """Role should be created, verified, and deleted.""" - role_name = data_utils.rand_name(name='role-test-') + role_name = data_utils.rand_name(name='role-test') body = self.client.create_role(role_name) self.assertEqual(role_name, body['name']) diff --git a/tempest/api/identity/admin/v2/test_roles_negative.py b/tempest/api/identity/admin/v2/test_roles_negative.py index 662d1eae4..5e197ece6 100644 --- a/tempest/api/identity/admin/v2/test_roles_negative.py +++ b/tempest/api/identity/admin/v2/test_roles_negative.py @@ -58,7 +58,7 @@ class RolesNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('585c8998-a8a4-4641-a5dd-abef7a8ced00') def test_create_role_by_unauthorized_user(self): # Non-administrator user should not be able to create role - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') self.assertRaises(lib_exc.Forbidden, self.non_admin_client.create_role, role_name) @@ -68,7 +68,7 @@ class RolesNegativeTestJSON(base.BaseIdentityV2AdminTest): # Request to create role without a valid token should fail token = self.client.auth_provider.get_token() self.client.delete_token(token) - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') self.assertRaises(lib_exc.Unauthorized, self.client.create_role, role_name) self.client.auth_provider.clear_auth() @@ -77,7 +77,7 @@ class RolesNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('c0cde2c8-81c1-4bb0-8fe2-cf615a3547a8') def test_role_create_duplicate(self): # Role names should be unique - role_name = data_utils.rand_name(name='role-dup-') + role_name = data_utils.rand_name(name='role-dup') body = self.client.create_role(role_name) role1_id = body.get('id') self.addCleanup(self.client.delete_role, role1_id) @@ -88,7 +88,7 @@ class RolesNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('15347635-b5b1-4a87-a280-deb2bd6d865e') def test_delete_role_by_unauthorized_user(self): # Non-administrator user should not be able to delete role - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') body = self.client.create_role(role_name) self.data.roles.append(body) role_id = body.get('id') @@ -99,7 +99,7 @@ class RolesNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('44b60b20-70de-4dac-beaf-a3fc2650a16b') def test_delete_role_request_without_token(self): # Request to delete role without a valid token should fail - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') body = self.client.create_role(role_name) self.data.roles.append(body) role_id = body.get('id') diff --git a/tempest/api/identity/admin/v2/test_services.py b/tempest/api/identity/admin/v2/test_services.py index 0759ec53f..326c78bd4 100644 --- a/tempest/api/identity/admin/v2/test_services.py +++ b/tempest/api/identity/admin/v2/test_services.py @@ -35,9 +35,9 @@ class ServicesTestJSON(base.BaseIdentityV2AdminTest): def test_create_get_delete_service(self): # GET Service # Creating a Service - name = data_utils.rand_name('service-') - type = data_utils.rand_name('type--') - description = data_utils.rand_name('description-') + name = data_utils.rand_name('service') + type = data_utils.rand_name('type') + description = data_utils.rand_name('description') service_data = self.client.create_service( name, type, description=description) self.assertFalse(service_data['id'] is None) @@ -67,8 +67,8 @@ class ServicesTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('5d3252c8-e555-494b-a6c8-e11d7335da42') def test_create_service_without_description(self): # Create a service only with name and type - name = data_utils.rand_name('service-') - type = data_utils.rand_name('type--') + name = data_utils.rand_name('service') + type = data_utils.rand_name('type') service = self.client.create_service(name, type) self.assertIn('id', service) self.addCleanup(self._del_service, service['id']) @@ -83,9 +83,9 @@ class ServicesTestJSON(base.BaseIdentityV2AdminTest): # Create, List, Verify and Delete Services services = [] for _ in moves.xrange(3): - name = data_utils.rand_name('service-') - type = data_utils.rand_name('type--') - description = data_utils.rand_name('description-') + name = data_utils.rand_name('service') + type = data_utils.rand_name('type') + description = data_utils.rand_name('description') service = self.client.create_service( name, type, description=description) services.append(service) diff --git a/tempest/api/identity/admin/v2/test_tenant_negative.py b/tempest/api/identity/admin/v2/test_tenant_negative.py index 8fd1f5acf..3ee412b3e 100644 --- a/tempest/api/identity/admin/v2/test_tenant_negative.py +++ b/tempest/api/identity/admin/v2/test_tenant_negative.py @@ -44,7 +44,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('162ba316-f18b-4987-8c0c-fd9140cd63ed') def test_tenant_delete_by_unauthorized_user(self): # Non-administrator user should not be able to delete a tenant - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') tenant = self.client.create_tenant(tenant_name) self.data.tenants.append(tenant) self.assertRaises(lib_exc.Forbidden, @@ -54,7 +54,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('e450db62-2e9d-418f-893a-54772d6386b1') def test_tenant_delete_request_without_token(self): # Request to delete a tenant without a valid token should fail - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') tenant = self.client.create_tenant(tenant_name) self.data.tenants.append(tenant) token = self.client.auth_provider.get_token() @@ -74,7 +74,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('af16f44b-a849-46cb-9f13-a751c388f739') def test_tenant_create_duplicate(self): # Tenant names should be unique - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') body = self.client.create_tenant(tenant_name) tenant = body self.data.tenants.append(tenant) @@ -89,7 +89,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('d26b278a-6389-4702-8d6e-5980d80137e0') def test_create_tenant_by_unauthorized_user(self): # Non-administrator user should not be authorized to create a tenant - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') self.assertRaises(lib_exc.Forbidden, self.non_admin_client.create_tenant, tenant_name) @@ -97,7 +97,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('a3ee9d7e-6920-4dd5-9321-d4b2b7f0a638') def test_create_tenant_request_without_token(self): # Create tenant request without a token should not be authorized - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') token = self.client.auth_provider.get_token() self.client.delete_token(token) self.assertRaises(lib_exc.Unauthorized, self.client.create_tenant, @@ -130,7 +130,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('41704dc5-c5f7-4f79-abfa-76e6fedc570b') def test_tenant_update_by_unauthorized_user(self): # Non-administrator user should not be able to update a tenant - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') tenant = self.client.create_tenant(tenant_name) self.data.tenants.append(tenant) self.assertRaises(lib_exc.Forbidden, @@ -140,7 +140,7 @@ class TenantsNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('7a421573-72c7-4c22-a98e-ce539219c657') def test_tenant_update_request_without_token(self): # Request to update a tenant without a valid token should fail - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') tenant = self.client.create_tenant(tenant_name) self.data.tenants.append(tenant) token = self.client.auth_provider.get_token() diff --git a/tempest/api/identity/admin/v2/test_tenants.py b/tempest/api/identity/admin/v2/test_tenants.py index 0be25a9ca..5dba65a46 100644 --- a/tempest/api/identity/admin/v2/test_tenants.py +++ b/tempest/api/identity/admin/v2/test_tenants.py @@ -49,8 +49,8 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('d25e9f24-1310-4d29-b61b-d91299c21d6d') def test_tenant_create_with_description(self): # Create tenant with a description - tenant_name = data_utils.rand_name(name='tenant-') - tenant_desc = data_utils.rand_name(name='desc-') + tenant_name = data_utils.rand_name(name='tenant') + tenant_desc = data_utils.rand_name(name='desc') body = self.client.create_tenant(tenant_name, description=tenant_desc) tenant = body @@ -70,7 +70,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('670bdddc-1cd7-41c7-b8e2-751cfb67df50') def test_tenant_create_enabled(self): # Create a tenant that is enabled - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') body = self.client.create_tenant(tenant_name, enabled=True) tenant = body self.data.tenants.append(tenant) @@ -87,7 +87,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('3be22093-b30f-499d-b772-38340e5e16fb') def test_tenant_create_not_enabled(self): # Create a tenant that is not enabled - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') body = self.client.create_tenant(tenant_name, enabled=False) tenant = body self.data.tenants.append(tenant) @@ -106,7 +106,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('781f2266-d128-47f3-8bdb-f70970add238') def test_tenant_update_name(self): # Update name attribute of a tenant - t_name1 = data_utils.rand_name(name='tenant-') + t_name1 = data_utils.rand_name(name='tenant') body = self.client.create_tenant(t_name1) tenant = body self.data.tenants.append(tenant) @@ -114,7 +114,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): t_id = body['id'] resp1_name = body['name'] - t_name2 = data_utils.rand_name(name='tenant2-') + t_name2 = data_utils.rand_name(name='tenant2') body = self.client.update_tenant(t_id, name=t_name2) resp2_name = body['name'] self.assertNotEqual(resp1_name, resp2_name) @@ -133,8 +133,8 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('859fcfe1-3a03-41ef-86f9-b19a47d1cd87') def test_tenant_update_desc(self): # Update description attribute of a tenant - t_name = data_utils.rand_name(name='tenant-') - t_desc = data_utils.rand_name(name='desc-') + t_name = data_utils.rand_name(name='tenant') + t_desc = data_utils.rand_name(name='desc') body = self.client.create_tenant(t_name, description=t_desc) tenant = body self.data.tenants.append(tenant) @@ -142,7 +142,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): t_id = body['id'] resp1_desc = body['description'] - t_desc2 = data_utils.rand_name(name='desc2-') + t_desc2 = data_utils.rand_name(name='desc2') body = self.client.update_tenant(t_id, description=t_desc2) resp2_desc = body['description'] self.assertNotEqual(resp1_desc, resp2_desc) @@ -161,7 +161,7 @@ class TenantsTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('8fc8981f-f12d-4c66-9972-2bdcf2bc2e1a') def test_tenant_update_enable(self): # Update the enabled attribute of a tenant - t_name = data_utils.rand_name(name='tenant-') + t_name = data_utils.rand_name(name='tenant') t_en = False body = self.client.create_tenant(t_name, enabled=t_en) tenant = body diff --git a/tempest/api/identity/admin/v2/test_tokens.py b/tempest/api/identity/admin/v2/test_tokens.py index 29ba1de26..860e5af7e 100644 --- a/tempest/api/identity/admin/v2/test_tokens.py +++ b/tempest/api/identity/admin/v2/test_tokens.py @@ -25,10 +25,10 @@ class TokensTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('453ad4d5-e486-4b2f-be72-cffc8149e586') def test_create_get_delete_token(self): # get a token by username and password - user_name = data_utils.rand_name(name='user-') - user_password = data_utils.rand_name(name='pass-') + user_name = data_utils.rand_name(name='user') + user_password = data_utils.rand_name(name='pass') # first:create a tenant - tenant_name = data_utils.rand_name(name='tenant-') + tenant_name = data_utils.rand_name(name='tenant') tenant = self.client.create_tenant(tenant_name) self.data.tenants.append(tenant) # second:create a user @@ -60,8 +60,8 @@ class TokensTestJSON(base.BaseIdentityV2AdminTest): """ # Create a user. - user_name = data_utils.rand_name(name='user-') - user_password = data_utils.rand_name(name='pass-') + user_name = data_utils.rand_name(name='user') + user_password = data_utils.rand_name(name='pass') tenant_id = None # No default tenant so will get unscoped token. email = '' user = self.client.create_user(user_name, user_password, @@ -69,16 +69,16 @@ class TokensTestJSON(base.BaseIdentityV2AdminTest): self.data.users.append(user) # Create a couple tenants. - tenant1_name = data_utils.rand_name(name='tenant-') + tenant1_name = data_utils.rand_name(name='tenant') tenant1 = self.client.create_tenant(tenant1_name) self.data.tenants.append(tenant1) - tenant2_name = data_utils.rand_name(name='tenant-') + tenant2_name = data_utils.rand_name(name='tenant') tenant2 = self.client.create_tenant(tenant2_name) self.data.tenants.append(tenant2) # Create a role - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') role = self.client.create_role(role_name) self.data.roles.append(role) diff --git a/tempest/api/identity/admin/v2/test_users.py b/tempest/api/identity/admin/v2/test_users.py index 2ca559565..f47f9850f 100644 --- a/tempest/api/identity/admin/v2/test_users.py +++ b/tempest/api/identity/admin/v2/test_users.py @@ -25,8 +25,8 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): @classmethod def resource_setup(cls): super(UsersTestJSON, cls).resource_setup() - cls.alt_user = data_utils.rand_name('test_user_') - cls.alt_password = data_utils.rand_name('pass_') + cls.alt_user = data_utils.rand_name('test_user') + cls.alt_password = data_utils.rand_name('pass') cls.alt_email = cls.alt_user + '@testmail.tm' @test.attr(type='smoke') @@ -45,7 +45,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): def test_create_user_with_enabled(self): # Create a user with enabled : False self.data.setup_test_tenant() - name = data_utils.rand_name('test_user_') + name = data_utils.rand_name('test_user') user = self.client.create_user(name, self.alt_password, self.data.tenant['id'], self.alt_email, enabled=False) @@ -58,7 +58,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('39d05857-e8a5-4ed4-ba83-0b52d3ab97ee') def test_update_user(self): # Test case to check if updating of user attributes is successful. - test_user = data_utils.rand_name('test_user_') + test_user = data_utils.rand_name('test_user') self.data.setup_test_tenant() user = self.client.create_user(test_user, self.alt_password, self.data.tenant['id'], @@ -66,7 +66,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): # Delete the User at the end of this method self.addCleanup(self.client.delete_user, user['id']) # Updating user details with new values - u_name2 = data_utils.rand_name('user2-') + u_name2 = data_utils.rand_name('user2') u_email2 = u_name2 + '@testmail.tm' update_user = self.client.update_user(user['id'], name=u_name2, email=u_email2, @@ -85,7 +85,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('29ed26f4-a74e-4425-9a85-fdb49fa269d2') def test_delete_user(self): # Delete a user - test_user = data_utils.rand_name('test_user_') + test_user = data_utils.rand_name('test_user') self.data.setup_test_tenant() user = self.client.create_user(test_user, self.alt_password, self.data.tenant['id'], @@ -139,14 +139,14 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): self.data.setup_test_tenant() user_ids = list() fetched_user_ids = list() - alt_tenant_user1 = data_utils.rand_name('tenant_user1_') + alt_tenant_user1 = data_utils.rand_name('tenant_user1') user1 = self.client.create_user(alt_tenant_user1, 'password1', self.data.tenant['id'], 'user1@123') user_ids.append(user1['id']) self.data.users.append(user1) - alt_tenant_user2 = data_utils.rand_name('tenant_user2_') + alt_tenant_user2 = data_utils.rand_name('tenant_user2') user2 = self.client.create_user(alt_tenant_user2, 'password2', self.data.tenant['id'], 'user2@123') @@ -179,7 +179,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): role = self.client.assign_user_role(tenant['id'], user['id'], role['id']) - alt_user2 = data_utils.rand_name('second_user_') + alt_user2 = data_utils.rand_name('second_user') second_user = self.client.create_user(alt_user2, 'password1', self.data.tenant['id'], 'user2@123') @@ -205,7 +205,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): # Test case to check if updating of user password is successful. self.data.setup_test_user() # Updating the user with new password - new_pass = data_utils.rand_name('pass-') + new_pass = data_utils.rand_name('pass') update_user = self.client.update_user_password( self.data.user['id'], new_pass) self.assertEqual(update_user['id'], self.data.user['id']) diff --git a/tempest/api/identity/admin/v2/test_users_negative.py b/tempest/api/identity/admin/v2/test_users_negative.py index 387b7142a..dcf55653d 100644 --- a/tempest/api/identity/admin/v2/test_users_negative.py +++ b/tempest/api/identity/admin/v2/test_users_negative.py @@ -27,8 +27,8 @@ class UsersNegativeTestJSON(base.BaseIdentityV2AdminTest): @classmethod def resource_setup(cls): super(UsersNegativeTestJSON, cls).resource_setup() - cls.alt_user = data_utils.rand_name('test_user_') - cls.alt_password = data_utils.rand_name('pass_') + cls.alt_user = data_utils.rand_name('test_user') + cls.alt_password = data_utils.rand_name('pass') cls.alt_email = cls.alt_user + '@testmail.tm' @test.attr(type=['negative', 'gate']) @@ -97,7 +97,7 @@ class UsersNegativeTestJSON(base.BaseIdentityV2AdminTest): def test_create_user_with_enabled_non_bool(self): # Attempt to create a user with valid enabled para should fail self.data.setup_test_tenant() - name = data_utils.rand_name('test_user_') + name = data_utils.rand_name('test_user') self.assertRaises(lib_exc.BadRequest, self.client.create_user, name, self.alt_password, self.data.tenant['id'], @@ -107,7 +107,7 @@ class UsersNegativeTestJSON(base.BaseIdentityV2AdminTest): @test.idempotent_id('3d07e294-27a0-4144-b780-a2a1bf6fee19') def test_update_user_for_non_existent_user(self): # Attempt to update a user non-existent user should fail - user_name = data_utils.rand_name('user-') + user_name = data_utils.rand_name('user') non_existent_id = str(uuid.uuid4()) self.assertRaises(lib_exc.NotFound, self.client.update_user, non_existent_id, name=user_name) diff --git a/tempest/api/identity/admin/v3/test_credentials.py b/tempest/api/identity/admin/v3/test_credentials.py index c42761599..9bad8e06c 100644 --- a/tempest/api/identity/admin/v3/test_credentials.py +++ b/tempest/api/identity/admin/v3/test_credentials.py @@ -27,14 +27,14 @@ class CredentialsTestJSON(base.BaseIdentityV3AdminTest): cls.projects = list() cls.creds_list = [['project_id', 'user_id', 'id'], ['access', 'secret']] - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = '%s description' % u_name u_email = '%s@testmail.tm' % u_name - u_password = data_utils.rand_name('pass-') + u_password = data_utils.rand_name('pass') for i in range(2): cls.project = cls.client.create_project( - data_utils.rand_name('project-'), - description=data_utils.rand_name('project-desc-')) + data_utils.rand_name('project'), + description=data_utils.rand_name('project-desc')) cls.projects.append(cls.project['id']) cls.user_body = cls.client.create_user( @@ -54,8 +54,8 @@ class CredentialsTestJSON(base.BaseIdentityV3AdminTest): @test.attr(type='smoke') @test.idempotent_id('7cd59bf9-bda4-4c72-9467-d21cab278355') def test_credentials_create_get_update_delete(self): - keys = [data_utils.rand_name('Access-'), - data_utils.rand_name('Secret-')] + keys = [data_utils.rand_name('Access'), + data_utils.rand_name('Secret')] cred = self.creds_client.create_credential( keys[0], keys[1], self.user_body['id'], self.projects[0]) @@ -65,8 +65,8 @@ class CredentialsTestJSON(base.BaseIdentityV3AdminTest): for value2 in self.creds_list[1]: self.assertIn(value2, cred['blob']) - new_keys = [data_utils.rand_name('NewAccess-'), - data_utils.rand_name('NewSecret-')] + new_keys = [data_utils.rand_name('NewAccess'), + data_utils.rand_name('NewSecret')] update_body = self.creds_client.update_credential( cred['id'], access_key=new_keys[0], secret_key=new_keys[1], project_id=self.projects[1]) @@ -92,8 +92,8 @@ class CredentialsTestJSON(base.BaseIdentityV3AdminTest): for i in range(2): cred = self.creds_client.create_credential( - data_utils.rand_name('Access-'), - data_utils.rand_name('Secret-'), + data_utils.rand_name('Access'), + data_utils.rand_name('Secret'), self.user_body['id'], self.projects[0]) created_cred_ids.append(cred['id']) self.addCleanup(self._delete_credential, cred['id']) diff --git a/tempest/api/identity/admin/v3/test_domains.py b/tempest/api/identity/admin/v3/test_domains.py index 1f6e6513a..c6d379c09 100644 --- a/tempest/api/identity/admin/v3/test_domains.py +++ b/tempest/api/identity/admin/v3/test_domains.py @@ -35,8 +35,8 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): fetched_ids = list() for _ in range(3): domain = self.client.create_domain( - data_utils.rand_name('domain-'), - description=data_utils.rand_name('domain-desc-')) + data_utils.rand_name('domain'), + description=data_utils.rand_name('domain-desc')) # Delete the domain at the end of this method self.addCleanup(self._delete_domain, domain['id']) domain_ids.append(domain['id']) @@ -50,8 +50,8 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): @test.attr(type='smoke') @test.idempotent_id('f2f5b44a-82e8-4dad-8084-0661ea3b18cf') def test_create_update_delete_domain(self): - d_name = data_utils.rand_name('domain-') - d_desc = data_utils.rand_name('domain-desc-') + d_name = data_utils.rand_name('domain') + d_desc = data_utils.rand_name('domain-desc') domain = self.client.create_domain( d_name, description=d_desc) self.addCleanup(self._delete_domain, domain['id']) @@ -64,8 +64,8 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): self.assertEqual(d_name, domain['name']) self.assertEqual(d_desc, domain['description']) self.assertEqual(True, domain['enabled']) - new_desc = data_utils.rand_name('new-desc-') - new_name = data_utils.rand_name('new-name-') + new_desc = data_utils.rand_name('new-desc') + new_name = data_utils.rand_name('new-name') updated_domain = self.client.update_domain( domain['id'], name=new_name, description=new_desc) @@ -88,8 +88,8 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('036df86e-bb5d-42c0-a7c2-66b9db3a6046') def test_create_domain_with_disabled_status(self): # Create domain with enabled status as false - d_name = data_utils.rand_name('domain-') - d_desc = data_utils.rand_name('domain-desc-') + d_name = data_utils.rand_name('domain') + d_desc = data_utils.rand_name('domain-desc') domain = self.client.create_domain( d_name, description=d_desc, enabled=False) self.addCleanup(self.client.delete_domain, domain['id']) diff --git a/tempest/api/identity/admin/v3/test_endpoints.py b/tempest/api/identity/admin/v3/test_endpoints.py index c683f59d3..2d8c04f60 100644 --- a/tempest/api/identity/admin/v3/test_endpoints.py +++ b/tempest/api/identity/admin/v3/test_endpoints.py @@ -31,9 +31,9 @@ class EndPointsTestJSON(base.BaseIdentityV3AdminTest): def resource_setup(cls): super(EndPointsTestJSON, cls).resource_setup() cls.service_ids = list() - s_name = data_utils.rand_name('service-') - s_type = data_utils.rand_name('type--') - s_description = data_utils.rand_name('description-') + s_name = data_utils.rand_name('service') + s_type = data_utils.rand_name('type') + s_description = data_utils.rand_name('description') cls.service_data =\ cls.service_client.create_service(s_name, s_type, description=s_description) @@ -107,9 +107,9 @@ class EndPointsTestJSON(base.BaseIdentityV3AdminTest): enabled=True) self.addCleanup(self.client.delete_endpoint, endpoint_for_update['id']) # Creating service so as update endpoint with new service ID - s_name = data_utils.rand_name('service-') - s_type = data_utils.rand_name('type--') - s_description = data_utils.rand_name('description-') + s_name = data_utils.rand_name('service') + s_type = data_utils.rand_name('type') + s_description = data_utils.rand_name('description') service2 =\ self.service_client.create_service(s_name, s_type, description=s_description) diff --git a/tempest/api/identity/admin/v3/test_endpoints_negative.py b/tempest/api/identity/admin/v3/test_endpoints_negative.py index e2b7edcb8..8b855665c 100644 --- a/tempest/api/identity/admin/v3/test_endpoints_negative.py +++ b/tempest/api/identity/admin/v3/test_endpoints_negative.py @@ -33,9 +33,9 @@ class EndpointsNegativeTestJSON(base.BaseIdentityV3AdminTest): def resource_setup(cls): super(EndpointsNegativeTestJSON, cls).resource_setup() cls.service_ids = list() - s_name = data_utils.rand_name('service-') - s_type = data_utils.rand_name('type--') - s_description = data_utils.rand_name('description-') + s_name = data_utils.rand_name('service') + s_type = data_utils.rand_name('type') + s_description = data_utils.rand_name('description') cls.service_data = ( cls.service_client.create_service(s_name, s_type, description=s_description)) diff --git a/tempest/api/identity/admin/v3/test_groups.py b/tempest/api/identity/admin/v3/test_groups.py index 98d1846fa..b366d1e09 100644 --- a/tempest/api/identity/admin/v3/test_groups.py +++ b/tempest/api/identity/admin/v3/test_groups.py @@ -75,13 +75,13 @@ class GroupsV3TestJSON(base.BaseIdentityV3AdminTest): def test_list_user_groups(self): # create a user user = self.client.create_user( - data_utils.rand_name('User-'), - password=data_utils.rand_name('Pass-')) + data_utils.rand_name('User'), + password=data_utils.rand_name('Pass')) self.addCleanup(self.client.delete_user, user['id']) # create two groups, and add user into them groups = [] for i in range(2): - name = data_utils.rand_name('Group-') + name = data_utils.rand_name('Group') group = self.client.create_group(name) groups.append(group) self.addCleanup(self.client.delete_group, group['id']) diff --git a/tempest/api/identity/admin/v3/test_policies.py b/tempest/api/identity/admin/v3/test_policies.py index 63d2b0db1..bad56f4de 100644 --- a/tempest/api/identity/admin/v3/test_policies.py +++ b/tempest/api/identity/admin/v3/test_policies.py @@ -31,8 +31,8 @@ class PoliciesTestJSON(base.BaseIdentityV3AdminTest): policy_ids = list() fetched_ids = list() for _ in range(3): - blob = data_utils.rand_name('BlobName-') - policy_type = data_utils.rand_name('PolicyType-') + blob = data_utils.rand_name('BlobName') + policy_type = data_utils.rand_name('PolicyType') policy = self.policy_client.create_policy(blob, policy_type) # Delete the Policy at the end of this method @@ -49,8 +49,8 @@ class PoliciesTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('e544703a-2f03-4cf2-9b0f-350782fdb0d3') def test_create_update_delete_policy(self): # Test to update policy - blob = data_utils.rand_name('BlobName-') - policy_type = data_utils.rand_name('PolicyType-') + blob = data_utils.rand_name('BlobName') + policy_type = data_utils.rand_name('PolicyType') policy = self.policy_client.create_policy(blob, policy_type) self.addCleanup(self._delete_policy, policy['id']) self.assertIn('id', policy) @@ -60,7 +60,7 @@ class PoliciesTestJSON(base.BaseIdentityV3AdminTest): self.assertEqual(blob, policy['blob']) self.assertEqual(policy_type, policy['type']) # Update policy - update_type = data_utils.rand_name('UpdatedPolicyType-') + update_type = data_utils.rand_name('UpdatedPolicyType') data = self.policy_client.update_policy( policy['id'], type=update_type) self.assertIn('type', data) diff --git a/tempest/api/identity/admin/v3/test_projects.py b/tempest/api/identity/admin/v3/test_projects.py index 69b1fb4d1..5f8b3d198 100644 --- a/tempest/api/identity/admin/v3/test_projects.py +++ b/tempest/api/identity/admin/v3/test_projects.py @@ -25,8 +25,8 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('0ecf465c-0dc4-4532-ab53-91ffeb74d12d') def test_project_create_with_description(self): # Create project with a description - project_name = data_utils.rand_name('project-') - project_desc = data_utils.rand_name('desc-') + project_name = data_utils.rand_name('project') + project_desc = data_utils.rand_name('desc') project = self.client.create_project( project_name, description=project_desc) self.data.projects.append(project) @@ -59,7 +59,7 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('1f66dc76-50cc-4741-a200-af984509e480') def test_project_create_enabled(self): # Create a project that is enabled - project_name = data_utils.rand_name('project-') + project_name = data_utils.rand_name('project') project = self.client.create_project( project_name, enabled=True) self.data.projects.append(project) @@ -74,7 +74,7 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('78f96a9c-e0e0-4ee6-a3ba-fbf6dfd03207') def test_project_create_not_enabled(self): # Create a project that is not enabled - project_name = data_utils.rand_name('project-') + project_name = data_utils.rand_name('project') project = self.client.create_project( project_name, enabled=False) self.data.projects.append(project) @@ -90,13 +90,13 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('f608f368-048c-496b-ad63-d286c26dab6b') def test_project_update_name(self): # Update name attribute of a project - p_name1 = data_utils.rand_name('project-') + p_name1 = data_utils.rand_name('project') project = self.client.create_project(p_name1) self.data.projects.append(project) resp1_name = project['name'] - p_name2 = data_utils.rand_name('project2-') + p_name2 = data_utils.rand_name('project2') body = self.client.update_project(project['id'], name=p_name2) resp2_name = body['name'] self.assertNotEqual(resp1_name, resp2_name) @@ -112,14 +112,14 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('f138b715-255e-4a7d-871d-351e1ef2e153') def test_project_update_desc(self): # Update description attribute of a project - p_name = data_utils.rand_name('project-') - p_desc = data_utils.rand_name('desc-') + p_name = data_utils.rand_name('project') + p_desc = data_utils.rand_name('desc') project = self.client.create_project( p_name, description=p_desc) self.data.projects.append(project) resp1_desc = project['description'] - p_desc2 = data_utils.rand_name('desc2-') + p_desc2 = data_utils.rand_name('desc2') body = self.client.update_project( project['id'], description=p_desc2) resp2_desc = body['description'] @@ -136,7 +136,7 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('b6b25683-c97f-474d-a595-55d410b68100') def test_project_update_enable(self): # Update the enabled attribute of a project - p_name = data_utils.rand_name('project-') + p_name = data_utils.rand_name('project') p_en = False project = self.client.create_project(p_name, enabled=p_en) self.data.projects.append(project) @@ -161,15 +161,15 @@ class ProjectsTestJSON(base.BaseIdentityV3AdminTest): def test_associate_user_to_project(self): # Associate a user to a project # Create a Project - p_name = data_utils.rand_name('project-') + p_name = data_utils.rand_name('project') project = self.client.create_project(p_name) self.data.projects.append(project) # Create a User - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = u_name + 'description' u_email = u_name + '@testmail.tm' - u_password = data_utils.rand_name('pass-') + u_password = data_utils.rand_name('pass') user = self.client.create_user( u_name, description=u_desc, password=u_password, email=u_email, project_id=project['id']) diff --git a/tempest/api/identity/admin/v3/test_projects_negative.py b/tempest/api/identity/admin/v3/test_projects_negative.py index 739bb350c..2dda5852c 100644 --- a/tempest/api/identity/admin/v3/test_projects_negative.py +++ b/tempest/api/identity/admin/v3/test_projects_negative.py @@ -33,7 +33,7 @@ class ProjectsNegativeTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('874c3e84-d174-4348-a16b-8c01f599561b') def test_project_create_duplicate(self): # Project names should be unique - project_name = data_utils.rand_name('project-dup-') + project_name = data_utils.rand_name('project-dup') project = self.client.create_project(project_name) self.data.projects.append(project) @@ -44,7 +44,7 @@ class ProjectsNegativeTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('8fba9de2-3e1f-4e77-812a-60cb68f8df13') def test_create_project_by_unauthorized_user(self): # Non-admin user should not be authorized to create a project - project_name = data_utils.rand_name('project-') + project_name = data_utils.rand_name('project') self.assertRaises( lib_exc.Forbidden, self.non_admin_client.create_project, project_name) @@ -68,7 +68,7 @@ class ProjectsNegativeTestJSON(base.BaseIdentityV3AdminTest): @test.idempotent_id('8d68c012-89e0-4394-8d6b-ccd7196def97') def test_project_delete_by_unauthorized_user(self): # Non-admin user should not be able to delete a project - project_name = data_utils.rand_name('project-') + project_name = data_utils.rand_name('project') project = self.client.create_project(project_name) self.data.projects.append(project) self.assertRaises( diff --git a/tempest/api/identity/admin/v3/test_regions.py b/tempest/api/identity/admin/v3/test_regions.py index b5c337d95..146cc65bf 100644 --- a/tempest/api/identity/admin/v3/test_regions.py +++ b/tempest/api/identity/admin/v3/test_regions.py @@ -32,7 +32,7 @@ class RegionsTestJSON(base.BaseIdentityV3AdminTest): super(RegionsTestJSON, cls).resource_setup() cls.setup_regions = list() for i in range(2): - r_description = data_utils.rand_name('description-') + r_description = data_utils.rand_name('description') region = cls.client.create_region(r_description) cls.setup_regions.append(region) @@ -50,7 +50,7 @@ class RegionsTestJSON(base.BaseIdentityV3AdminTest): @test.attr(type='gate') @test.idempotent_id('56186092-82e4-43f2-b954-91013218ba42') def test_create_update_get_delete_region(self): - r_description = data_utils.rand_name('description-') + r_description = data_utils.rand_name('description') region = self.client.create_region( r_description, parent_region_id=self.setup_regions[0]['id']) self.addCleanup(self._delete_region, region['id']) @@ -58,7 +58,7 @@ class RegionsTestJSON(base.BaseIdentityV3AdminTest): self.assertEqual(self.setup_regions[0]['id'], region['parent_region_id']) # Update region with new description and parent ID - r_alt_description = data_utils.rand_name('description-') + r_alt_description = data_utils.rand_name('description') region = self.client.update_region( region['id'], description=r_alt_description, @@ -77,7 +77,7 @@ class RegionsTestJSON(base.BaseIdentityV3AdminTest): def test_create_region_with_specific_id(self): # Create a region with a specific id r_region_id = data_utils.rand_uuid() - r_description = data_utils.rand_name('description-') + r_description = data_utils.rand_name('description') region = self.client.create_region( r_description, unique_region_id=r_region_id) self.addCleanup(self._delete_region, region['id']) diff --git a/tempest/api/identity/admin/v3/test_roles.py b/tempest/api/identity/admin/v3/test_roles.py index b5b1d7b80..8334c184f 100644 --- a/tempest/api/identity/admin/v3/test_roles.py +++ b/tempest/api/identity/admin/v3/test_roles.py @@ -25,30 +25,30 @@ class RolesV3TestJSON(base.BaseIdentityV3AdminTest): def resource_setup(cls): super(RolesV3TestJSON, cls).resource_setup() for _ in range(3): - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') role = cls.client.create_role(role_name) cls.data.v3_roles.append(role) cls.fetched_role_ids = list() - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = '%s description' % u_name u_email = '%s@testmail.tm' % u_name - cls.u_password = data_utils.rand_name('pass-') + cls.u_password = data_utils.rand_name('pass') cls.domain = cls.client.create_domain( - data_utils.rand_name('domain-'), - description=data_utils.rand_name('domain-desc-')) + data_utils.rand_name('domain'), + description=data_utils.rand_name('domain-desc')) cls.project = cls.client.create_project( - data_utils.rand_name('project-'), - description=data_utils.rand_name('project-desc-'), + data_utils.rand_name('project'), + description=data_utils.rand_name('project-desc'), domain_id=cls.domain['id']) cls.group_body = cls.client.create_group( - data_utils.rand_name('Group-'), project_id=cls.project['id'], + data_utils.rand_name('Group'), project_id=cls.project['id'], domain_id=cls.domain['id']) cls.user_body = cls.client.create_user( u_name, description=u_desc, password=cls.u_password, email=u_email, project_id=cls.project['id'], domain_id=cls.domain['id']) cls.role = cls.client.create_role( - data_utils.rand_name('Role-')) + data_utils.rand_name('Role')) @classmethod def resource_cleanup(cls): @@ -69,13 +69,13 @@ class RolesV3TestJSON(base.BaseIdentityV3AdminTest): @test.attr(type='smoke') @test.idempotent_id('18afc6c0-46cf-4911-824e-9989cc056c3a') def test_role_create_update_get_list(self): - r_name = data_utils.rand_name('Role-') + r_name = data_utils.rand_name('Role') role = self.client.create_role(r_name) self.addCleanup(self.client.delete_role, role['id']) self.assertIn('name', role) self.assertEqual(role['name'], r_name) - new_name = data_utils.rand_name('NewRole-') + new_name = data_utils.rand_name('NewRole') updated_role = self.client.update_role(new_name, role['id']) self.assertIn('name', updated_role) self.assertIn('id', updated_role) diff --git a/tempest/api/identity/admin/v3/test_tokens.py b/tempest/api/identity/admin/v3/test_tokens.py index 7358ce9af..702e9366e 100644 --- a/tempest/api/identity/admin/v3/test_tokens.py +++ b/tempest/api/identity/admin/v3/test_tokens.py @@ -27,10 +27,10 @@ class TokensV3TestJSON(base.BaseIdentityV3AdminTest): def test_tokens(self): # Valid user's token is authenticated # Create a User - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = '%s-description' % u_name u_email = '%s@testmail.tm' % u_name - u_password = data_utils.rand_name('pass-') + u_password = data_utils.rand_name('pass') user = self.client.create_user( u_name, description=u_desc, password=u_password, email=u_email) @@ -61,22 +61,22 @@ class TokensV3TestJSON(base.BaseIdentityV3AdminTest): """ # Create a user. - user_name = data_utils.rand_name(name='user-') - user_password = data_utils.rand_name(name='pass-') + user_name = data_utils.rand_name(name='user') + user_password = data_utils.rand_name(name='pass') user = self.client.create_user(user_name, password=user_password) self.addCleanup(self.client.delete_user, user['id']) # Create a couple projects - project1_name = data_utils.rand_name(name='project-') + project1_name = data_utils.rand_name(name='project') project1 = self.client.create_project(project1_name) self.addCleanup(self.client.delete_project, project1['id']) - project2_name = data_utils.rand_name(name='project-') + project2_name = data_utils.rand_name(name='project') project2 = self.client.create_project(project2_name) self.addCleanup(self.client.delete_project, project2['id']) # Create a role - role_name = data_utils.rand_name(name='role-') + role_name = data_utils.rand_name(name='role') role = self.client.create_role(role_name) self.addCleanup(self.client.delete_role, role['id']) diff --git a/tempest/api/identity/admin/v3/test_trusts.py b/tempest/api/identity/admin/v3/test_trusts.py index 9d3d0bc40..cafd61590 100644 --- a/tempest/api/identity/admin/v3/test_trusts.py +++ b/tempest/api/identity/admin/v3/test_trusts.py @@ -52,10 +52,10 @@ class BaseTrustsV3Test(base.BaseIdentityV3AdminTest): self.assertIsNotNone(self.trustor_project_id) # Create a trustor User - self.trustor_username = data_utils.rand_name('user-') + self.trustor_username = data_utils.rand_name('user') u_desc = self.trustor_username + 'description' u_email = self.trustor_username + '@testmail.xx' - self.trustor_password = data_utils.rand_name('pass-') + self.trustor_password = data_utils.rand_name('pass') user = self.client.create_user( self.trustor_username, description=u_desc, @@ -65,8 +65,8 @@ class BaseTrustsV3Test(base.BaseIdentityV3AdminTest): self.trustor_user_id = user['id'] # And two roles, one we'll delegate and one we won't - self.delegated_role = data_utils.rand_name('DelegatedRole-') - self.not_delegated_role = data_utils.rand_name('NotDelegatedRole-') + self.delegated_role = data_utils.rand_name('DelegatedRole') + self.not_delegated_role = data_utils.rand_name('NotDelegatedRole') role = self.client.create_role(self.delegated_role) self.delegated_role_id = role['id'] diff --git a/tempest/api/identity/admin/v3/test_users.py b/tempest/api/identity/admin/v3/test_users.py index 9d9f61c86..e4bfd6afa 100644 --- a/tempest/api/identity/admin/v3/test_users.py +++ b/tempest/api/identity/admin/v3/test_users.py @@ -26,10 +26,10 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): def test_user_update(self): # Test case to check if updating of user attributes is successful. # Creating first user - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = u_name + 'description' u_email = u_name + '@testmail.tm' - u_password = data_utils.rand_name('pass-') + u_password = data_utils.rand_name('pass') user = self.client.create_user( u_name, description=u_desc, password=u_password, email=u_email, enabled=False) @@ -37,12 +37,12 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): self.addCleanup(self.client.delete_user, user['id']) # Creating second project for updation project = self.client.create_project( - data_utils.rand_name('project-'), - description=data_utils.rand_name('project-desc-')) + data_utils.rand_name('project'), + description=data_utils.rand_name('project-desc')) # Delete the Project at the end of this method self.addCleanup(self.client.delete_project, project['id']) # Updating user details with new values - u_name2 = data_utils.rand_name('user2-') + u_name2 = data_utils.rand_name('user2') u_email2 = u_name2 + '@testmail.tm' u_description2 = u_name2 + ' description' update_user = self.client.update_user( @@ -95,15 +95,15 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): assigned_project_ids = list() fetched_project_ids = list() u_project = self.client.create_project( - data_utils.rand_name('project-'), - description=data_utils.rand_name('project-desc-')) + data_utils.rand_name('project'), + description=data_utils.rand_name('project-desc')) # Delete the Project at the end of this method self.addCleanup(self.client.delete_project, u_project['id']) # Create a user. - u_name = data_utils.rand_name('user-') + u_name = data_utils.rand_name('user') u_desc = u_name + 'description' u_email = u_name + '@testmail.tm' - u_password = data_utils.rand_name('pass-') + u_password = data_utils.rand_name('pass') user_body = self.client.create_user( u_name, description=u_desc, password=u_password, email=u_email, enabled=False, project_id=u_project['id']) @@ -111,7 +111,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): self.addCleanup(self.client.delete_user, user_body['id']) # Creating Role role_body = self.client.create_role( - data_utils.rand_name('role-')) + data_utils.rand_name('role')) # Delete the Role at the end of this method self.addCleanup(self.client.delete_role, role_body['id']) @@ -120,8 +120,8 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): for i in range(2): # Creating project so as to assign role project_body = self.client.create_project( - data_utils.rand_name('project-'), - description=data_utils.rand_name('project-desc-')) + data_utils.rand_name('project'), + description=data_utils.rand_name('project-desc')) project = self.client.get_project(project_body['id']) # Delete the Project at the end of this method self.addCleanup(self.client.delete_project, project_body['id']) diff --git a/tempest/api/identity/base.py b/tempest/api/identity/base.py index 882ef9827..e171a02e9 100644 --- a/tempest/api/identity/base.py +++ b/tempest/api/identity/base.py @@ -171,8 +171,8 @@ class DataGenerator(object): def setup_test_user(self): """Set up a test user.""" self.setup_test_tenant() - self.test_user = data_utils.rand_name('test_user_') - self.test_password = data_utils.rand_name('pass_') + self.test_user = data_utils.rand_name('test_user') + self.test_password = data_utils.rand_name('pass') self.test_email = self.test_user + '@testmail.tm' self.user = self.client.create_user(self.test_user, self.test_password, @@ -182,8 +182,8 @@ class DataGenerator(object): def setup_test_tenant(self): """Set up a test tenant.""" - self.test_tenant = data_utils.rand_name('test_tenant_') - self.test_description = data_utils.rand_name('desc_') + self.test_tenant = data_utils.rand_name('test_tenant') + self.test_description = data_utils.rand_name('desc') self.tenant = self.client.create_tenant( name=self.test_tenant, description=self.test_description) @@ -198,8 +198,8 @@ class DataGenerator(object): def setup_test_v3_user(self): """Set up a test v3 user.""" self.setup_test_project() - self.test_user = data_utils.rand_name('test_user_') - self.test_password = data_utils.rand_name('pass_') + self.test_user = data_utils.rand_name('test_user') + self.test_password = data_utils.rand_name('pass') self.test_email = self.test_user + '@testmail.tm' self.v3_user = self.client.create_user( self.test_user, @@ -210,8 +210,8 @@ class DataGenerator(object): def setup_test_project(self): """Set up a test project.""" - self.test_project = data_utils.rand_name('test_project_') - self.test_description = data_utils.rand_name('desc_') + self.test_project = data_utils.rand_name('test_project') + self.test_description = data_utils.rand_name('desc') self.project = self.client.create_project( name=self.test_project, description=self.test_description) |