From 29f2655af2372023788cc5a88ed3de7db1d6f010 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Thu, 23 May 2013 09:39:20 -0500 Subject: Remove unused variables (flake8 F841) Change-Id: I716a6b61c2b3faaa23cc79f58c6c6e01cfc232f2 --- keystone/auth/plugins/password.py | 2 +- .../migrate_repo/versions/015_tenant_to_project.py | 4 +- .../versions/016_normalize_domain_ids.py | 12 ++--- .../migrate_repo/versions/017_membership_role.py | 14 ++--- .../migrate_repo/versions/018_add_trust_tables.py | 6 +-- .../versions/020_migrate_metadata_table_roles.py | 17 +++--- keystone/identity/controllers.py | 2 - keystone/token/backends/kvs.py | 1 - keystone/token/backends/sql.py | 2 +- tests/test_auth.py | 6 +-- tests/test_backend.py | 12 ++--- tests/test_backend_ldap.py | 2 +- tests/test_v3_auth.py | 60 +++++++--------------- tests/test_v3_identity.py | 18 +++---- tests/test_v3_protection.py | 45 ++++++---------- tox.ini | 2 +- 16 files changed, 78 insertions(+), 127 deletions(-) diff --git a/keystone/auth/plugins/password.py b/keystone/auth/plugins/password.py index 9d924059..d5043611 100644 --- a/keystone/auth/plugins/password.py +++ b/keystone/auth/plugins/password.py @@ -109,7 +109,7 @@ class Password(auth.AuthMethodHandler): # FIXME: identity.authenticate() can use some refactoring since # all we care is password matches - user_auth_data = self.identity_api.authenticate( + self.identity_api.authenticate( context=context, user_id=user_info.user_id, password=user_info.password) diff --git a/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py index a024eb0e..5f276c68 100644 --- a/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py +++ b/keystone/common/sql/migrate_repo/versions/015_tenant_to_project.py @@ -17,7 +17,7 @@ def downgrade_with_rename(meta, migrate_engine): def upgrade_with_copy(meta, migrate_engine): - legacy_table = sql.Table('user', meta, autoload=True) + sql.Table('user', meta, autoload=True) project_table = sql.Table( 'project', meta, @@ -69,7 +69,7 @@ def upgrade_with_copy(meta, migrate_engine): def downgrade_with_copy(meta, migrate_engine): - legacy_table = sql.Table('user', meta, autoload=True) + sql.Table('user', meta, autoload=True) tenant_table = sql.Table( 'tenant', meta, diff --git a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py index 618c738b..71a3ef59 100644 --- a/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py +++ b/keystone/common/sql/migrate_repo/versions/016_normalize_domain_ids.py @@ -94,7 +94,7 @@ def upgrade_user_table_with_copy(meta, migrate_engine, session): # different version of the user table meta2 = sql.MetaData() meta2.bind = migrate_engine - domain_table = sql.Table('domain', meta2, autoload=True) + sql.Table('domain', meta2, autoload=True) user_table = sql.Table( 'user', meta2, @@ -163,7 +163,7 @@ def upgrade_project_table_with_copy(meta, migrate_engine, session): # different version of the project table meta2 = sql.MetaData() meta2.bind = migrate_engine - domain_table = sql.Table('domain', meta2, autoload=True) + sql.Table('domain', meta2, autoload=True) project_table = sql.Table( 'project', meta2, @@ -326,7 +326,7 @@ def upgrade_user_table_with_col_create(meta, migrate_engine, session): # bat since any existing rows would cause an Integrity Error. # We therefore create it nullable, fill the column with the # default data and then set it to non nullable. - domain_table = sql.Table('domain', meta, autoload=True) + sql.Table('domain', meta, autoload=True) user_table = sql.Table('user', meta, autoload=True) user_table.create_column( sql.Column('domain_id', sql.String(64), @@ -353,7 +353,7 @@ def upgrade_project_table_with_col_create(meta, migrate_engine, session): # bat since any existing rows would cause an Integrity Error. # We therefore create it nullable, fill the column with the # default data and then set it to non nullable. - domain_table = sql.Table('domain', meta, autoload=True) + sql.Table('domain', meta, autoload=True) project_table = sql.Table('project', meta, autoload=True) project_table.create_column( sql.Column('domain_id', sql.String(64), @@ -381,7 +381,7 @@ def downgrade_user_table_with_col_drop(meta, migrate_engine, session): session.execute('ALTER TABLE "user" ADD UNIQUE (name);') session.commit() # And now go ahead an drop the domain_id column - domain_table = sql.Table('domain', meta, autoload=True) + sql.Table('domain', meta, autoload=True) user_table = sql.Table('user', meta, autoload=True) column = sql.Column('domain_id', sql.String(64), sql.ForeignKey('domain.id'), nullable=False) @@ -396,7 +396,7 @@ def downgrade_project_table_with_col_drop(meta, migrate_engine, session): 'UNIQUE (name);') session.commit() # And now go ahead an drop the domain_id column - domain_table = sql.Table('domain', meta, autoload=True) + sql.Table('domain', meta, autoload=True) project_table = sql.Table('project', meta, autoload=True) column = sql.Column('domain_id', sql.String(64), sql.ForeignKey('domain.id'), nullable=False) diff --git a/keystone/common/sql/migrate_repo/versions/017_membership_role.py b/keystone/common/sql/migrate_repo/versions/017_membership_role.py index 2fa03cd7..85333057 100644 --- a/keystone/common/sql/migrate_repo/versions/017_membership_role.py +++ b/keystone/common/sql/migrate_repo/versions/017_membership_role.py @@ -12,9 +12,9 @@ def upgrade(migrate_engine): meta = sql.MetaData() meta.bind = migrate_engine - user_table = sql.Table('user', meta, autoload=True) + sql.Table('user', meta, autoload=True) + sql.Table('project', meta, autoload=True) role_table = sql.Table('role', meta, autoload=True) - project_table = sql.Table('project', meta, autoload=True) user_project_role_table = sql.Table( 'user_project_metadata', @@ -56,8 +56,8 @@ def downgrade(migrate_engine): meta = sql.MetaData() meta.bind = migrate_engine - user_table = sql.Table('user', meta, autoload=True) - project_table = sql.Table('project', meta, autoload=True) + sql.Table('user', meta, autoload=True) + sql.Table('project', meta, autoload=True) user_project_membership_table = sql.Table( 'user_project_membership', @@ -84,9 +84,9 @@ def downgrade(migrate_engine): if 'roles' in membership: roles = membership['roles'] if config.CONF.member_role_id in roles: - ins = (user_project_membership_table.insert() - .values(user_id=membership.user_id, - tenant_id=membership.project_id)) + user_project_membership_table.insert().values( + user_id=membership.user_id, + tenant_id=membership.project_id) session.close() role_table = sql.Table('role', meta, autoload=True) conn = migrate_engine.connect() diff --git a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py index 45a6f0db..46ed5ce0 100644 --- a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py +++ b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py @@ -23,9 +23,9 @@ def upgrade(migrate_engine): meta = sql.MetaData() meta.bind = migrate_engine - user_table = sql.Table('user', meta, autoload=True) - role_table = sql.Table('role', meta, autoload=True) - tenant_table = sql.Table('project', meta, autoload=True) + sql.Table('user', meta, autoload=True) + sql.Table('role', meta, autoload=True) + sql.Table('project', meta, autoload=True) trust_table = sql.Table( 'trust', diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py index fe0d51d7..b68b261d 100644 --- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py +++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py @@ -12,9 +12,9 @@ def upgrade(migrate_engine): meta = sql.MetaData() meta.bind = migrate_engine - user_table = sql.Table('user', meta, autoload=True) - role_table = sql.Table('role', meta, autoload=True) - project_table = sql.Table('project', meta, autoload=True) + sql.Table('user', meta, autoload=True) + sql.Table('role', meta, autoload=True) + sql.Table('project', meta, autoload=True) new_metadata_table = sql.Table('user_project_metadata', meta, autoload=True) @@ -60,8 +60,8 @@ def downgrade(migrate_engine): meta = sql.MetaData() meta.bind = migrate_engine - user_table = sql.Table('user', meta, autoload=True) - project_table = sql.Table('project', meta, autoload=True) + sql.Table('user', meta, autoload=True) + sql.Table('project', meta, autoload=True) metadata_table = sql.Table( 'metadata', @@ -92,9 +92,8 @@ def downgrade(migrate_engine): for metadata in session.query(user_project_metadata_table): if 'roles' in metadata: - roles = json.loads(metadata.data) - ins = (metadata_table.insert() - .values(user_id=metadata.user_id, - tenant_id=metadata.project_id)) + metadata_table.insert().values( + user_id=metadata.user_id, + tenant_id=metadata.project_id) session.close() diff --git a/keystone/identity/controllers.py b/keystone/identity/controllers.py index 837b38d7..125edddc 100644 --- a/keystone/identity/controllers.py +++ b/keystone/identity/controllers.py @@ -395,8 +395,6 @@ class Role(controller.V2Controller): role_id = role_ref_ref.get('roleId')[0] self.identity_api.remove_role_from_user_and_project( context, user_id, tenant_id, role_id) - roles = self.identity_api.get_roles_for_user_and_project( - context, user_id, tenant_id) self._delete_tokens_for_user(context, user_id) diff --git a/keystone/token/backends/kvs.py b/keystone/token/backends/kvs.py index 75c14eec..c16dd61b 100644 --- a/keystone/token/backends/kvs.py +++ b/keystone/token/backends/kvs.py @@ -75,7 +75,6 @@ class Token(kvs.Base, token.Driver): for token, ref in self.db.items(): if not token.startswith('token-') or self.is_expired(now, ref): continue - ref_trust_id = ref.get('trust_id') if self.trust_matches(trust_id, ref): tokens.append(token.split('-', 1)[1]) return tokens diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py index ac567d7f..df1bc958 100644 --- a/keystone/token/backends/sql.py +++ b/keystone/token/backends/sql.py @@ -88,7 +88,7 @@ class Token(sql.Base, token.Driver): token_references = query.filter_by(valid=True) for token_ref in token_references: token_ref_dict = token_ref.to_dict() - tokens.append(token_ref['id']) + tokens.append(token_ref_dict['id']) return tokens def _list_tokens_for_user(self, user_id, tenant_id=None): diff --git a/tests/test_auth.py b/tests/test_auth.py index faf117ca..7a6ca854 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -599,7 +599,6 @@ class AuthWithTrust(AuthTest): #TODO Endpoints def test_token_from_trust_wrong_user_fails(self): - new_trust = self.create_trust() request_body = self.build_v2_token_request('FOO', 'foo2') self.assertRaises( exception.Forbidden, @@ -681,7 +680,7 @@ class AuthWithTrust(AuthTest): def test_delete_tokens_for_user_invalidates_tokens_from_trust(self): self.assert_token_count_for_trust(0) - auth_response = self.fetch_v2_token_from_trust() + self.fetch_v2_token_from_trust() self.assert_token_count_for_trust(1) self.trust_controller._delete_tokens_for_user( {}, @@ -699,9 +698,8 @@ class AuthWithTrust(AuthTest): def test_delete_trust_revokes_token(self): context = {'token_id': self.unscoped_token['access']['token']['id']} - auth_response = self.fetch_v2_token_from_trust() + self.fetch_v2_token_from_trust() trust_id = self.new_trust['id'] - trust_token_id = auth_response['access']['token']['id'] tokens = self.token_api.list_tokens(self.trustor['id'], trust_id=trust_id) self.assertEquals(len(tokens), 1) diff --git a/tests/test_backend.py b/tests/test_backend.py index c465d128..e83338c9 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -1832,12 +1832,12 @@ class IdentityTests(object): self.identity_man.create_user({}, new_user['id'], new_user) self.identity_api.add_user_to_group(new_user['id'], new_group['id']) - agroups = self.identity_api.list_groups_for_user(new_user['id']) + groups = self.identity_api.list_groups_for_user(new_user['id']) + self.assertIn(new_group['id'], [x['id'] for x in groups]) self.identity_api.remove_user_from_group(new_user['id'], new_group['id']) groups = self.identity_api.list_groups_for_user(new_user['id']) - for x in groups: - self.assertFalse(x['id'] == new_group['id']) + self.assertNotIn(new_group['id'], [x['id'] for x in groups]) def test_remove_user_from_group_404(self): domain = self._get_domain_fixture() @@ -2271,7 +2271,7 @@ class TrustTests(object): def test_list_trust_by_trustee(self): for i in range(0, 3): - trust_data = self.create_sample_trust(uuid.uuid4().hex) + self.create_sample_trust(uuid.uuid4().hex) trusts = self.trust_api.list_trusts_for_trustee(self.trustee['id']) self.assertEqual(len(trusts), 3) self.assertEqual(trusts[0]["trustee_user_id"], self.trustee['id']) @@ -2280,7 +2280,7 @@ class TrustTests(object): def test_list_trust_by_trustor(self): for i in range(0, 3): - trust_data = self.create_sample_trust(uuid.uuid4().hex) + self.create_sample_trust(uuid.uuid4().hex) trusts = self.trust_api.list_trusts_for_trustor(self.trustor['id']) self.assertEqual(len(trusts), 3) self.assertEqual(trusts[0]["trustor_user_id"], self.trustor['id']) @@ -2289,7 +2289,7 @@ class TrustTests(object): def test_list_trusts(self): for i in range(0, 3): - trust_data = self.create_sample_trust(uuid.uuid4().hex) + self.create_sample_trust(uuid.uuid4().hex) trusts = self.trust_api.list_trusts() self.assertEqual(len(trusts), 3) diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py index c0bceea5..68b1f5df 100644 --- a/tests/test_backend_ldap.py +++ b/tests/test_backend_ldap.py @@ -422,7 +422,7 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests): self.identity_api.create_domain( CONF.identity.default_domain_id, domain) with self.assertRaises(exception.DomainNotFound): - domain_ref = self.identity_api.get_domain(domain['id']) + self.identity_api.get_domain(domain['id']) with self.assertRaises(exception.DomainNotFound): domain['description'] = uuid.uuid4().hex self.identity_api.update_domain(domain['id'], domain) diff --git a/tests/test_v3_auth.py b/tests/test_v3_auth.py index b52b26e0..170bfdee 100644 --- a/tests/test_v3_auth.py +++ b/tests/test_v3_auth.py @@ -131,7 +131,6 @@ class TestTokenAPIs(test_v3.RestfulTestCase): user_id=self.user['id'], password=self.user['password']) resp = self.post('/auth/tokens', body=auth_data) - token_data = resp.result token = resp.headers.get('X-Subject-Token') # now validate the v3 token with v2 API @@ -152,7 +151,6 @@ class TestTokenAPIs(test_v3.RestfulTestCase): password=self.user['password'], domain_id=self.domain['id']) resp = self.post('/auth/tokens', body=auth_data) - token_data = resp.result token = resp.headers.get('X-Subject-Token') # now validate the v3 token with v2 API @@ -168,7 +166,6 @@ class TestTokenAPIs(test_v3.RestfulTestCase): password=self.default_domain_user['password'], project_id=self.project['id']) resp = self.post('/auth/tokens', body=auth_data) - token_data = resp.result token = resp.headers.get('X-Subject-Token') # now validate the v3 token with v2 API @@ -429,51 +426,41 @@ class TestTokenRevoking(test_v3.RestfulTestCase): # Start by creating a couple of domains and projects self.domainA = self.new_domain_ref() - domainA_ref = self.identity_api.create_domain(self.domainA['id'], - self.domainA) + self.identity_api.create_domain(self.domainA['id'], self.domainA) self.domainB = self.new_domain_ref() - domainB_ref = self.identity_api.create_domain(self.domainB['id'], - self.domainB) + self.identity_api.create_domain(self.domainB['id'], self.domainB) self.projectA = self.new_project_ref(domain_id=self.domainA['id']) - projectA_ref = self.identity_api.create_project(self.projectA['id'], - self.projectA) + self.identity_api.create_project(self.projectA['id'], self.projectA) self.projectB = self.new_project_ref(domain_id=self.domainA['id']) - projectB_ref = self.identity_api.create_project(self.projectB['id'], - self.projectB) + self.identity_api.create_project(self.projectB['id'], self.projectB) # Now create some users, one in domainA and two of them in domainB self.user1 = self.new_user_ref( domain_id=self.domainA['id']) self.user1['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user1['id'], - self.user1) + self.identity_api.create_user(self.user1['id'], self.user1) self.user2 = self.new_user_ref( domain_id=self.domainB['id']) self.user2['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user2['id'], - self.user2) + self.identity_api.create_user(self.user2['id'], self.user2) self.user3 = self.new_user_ref( domain_id=self.domainB['id']) self.user3['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user3['id'], - self.user3) + self.identity_api.create_user(self.user3['id'], self.user3) self.group1 = self.new_group_ref( domain_id=self.domainA['id']) - user_ref = self.identity_api.create_group(self.group1['id'], - self.group1) + self.identity_api.create_group(self.group1['id'], self.group1) self.group2 = self.new_group_ref( domain_id=self.domainA['id']) - user_ref = self.identity_api.create_group(self.group2['id'], - self.group2) + self.identity_api.create_group(self.group2['id'], self.group2) self.group3 = self.new_group_ref( domain_id=self.domainB['id']) - user_ref = self.identity_api.create_group(self.group3['id'], - self.group3) + self.identity_api.create_group(self.group3['id'], self.group3) self.identity_api.add_user_to_group(self.user1['id'], self.group1['id']) @@ -951,7 +938,6 @@ class TestAuthJSON(test_v3.RestfulTestCase): self.assertValidUnscopedTokenResponse(r) token = r.headers.get('X-Subject-Token') - headers = {'X-Subject-Token': r.headers.get('X-Subject-Token')} # test token auth auth_data = self.build_authentication_request(token=token) @@ -1199,10 +1185,8 @@ class TestTrustAuth(TestAuthInfo): # now validate the v3 token with v2 API path = '/v2.0/tokens/%s' % (token) - resp = self.admin_request(path=path, - token='ADMIN', - method='GET', - expected_status=401) + self.admin_request( + path=path, token='ADMIN', method='GET', expected_status=401) def test_v3_v2_intermix_trustor_not_in_default_domaini_failed(self): ref = self.new_trust_ref( @@ -1235,10 +1219,8 @@ class TestTrustAuth(TestAuthInfo): # now validate the v3 token with v2 API path = '/v2.0/tokens/%s' % (token) - resp = self.admin_request(path=path, - token='ADMIN', - method='GET', - expected_status=401) + self.admin_request( + path=path, token='ADMIN', method='GET', expected_status=401) def test_v3_v2_intermix_project_not_in_default_domaini_failed(self): # create a trustee in default domain to delegate stuff to @@ -1277,10 +1259,8 @@ class TestTrustAuth(TestAuthInfo): # now validate the v3 token with v2 API path = '/v2.0/tokens/%s' % (token) - resp = self.admin_request(path=path, - token='ADMIN', - method='GET', - expected_status=401) + self.admin_request( + path=path, token='ADMIN', method='GET', expected_status=401) def test_v3_v2_intermix(self): # create a trustee in default domain to delegate stuff to @@ -1318,10 +1298,8 @@ class TestTrustAuth(TestAuthInfo): # now validate the v3 token with v2 API path = '/v2.0/tokens/%s' % (token) - resp = self.admin_request(path=path, - token='ADMIN', - method='GET', - expected_status=200) + self.admin_request( + path=path, token='ADMIN', method='GET', expected_status=200) def test_exercise_trust_scoped_token_without_impersonation(self): ref = self.new_trust_ref( @@ -1429,7 +1407,7 @@ class TestTrustAuth(TestAuthInfo): for i in range(0, 3): r = self.post('/OS-TRUST/trusts', body={'trust': ref}) - trust = self.assertValidTrustResponse(r, ref) + self.assertValidTrustResponse(r, ref) r = self.get('/OS-TRUST/trusts?trustor_user_id=%s' % self.user_id, expected_status=200) diff --git a/tests/test_v3_identity.py b/tests/test_v3_identity.py index 95d48a20..4d7b7e46 100644 --- a/tests/test_v3_identity.py +++ b/tests/test_v3_identity.py @@ -106,15 +106,13 @@ class IdentityTestCase(test_v3.RestfulTestCase): 'tenantId': self.project2['id'] } } - resp = self.admin_request(path='/v2.0/tokens', - method='POST', - body=body) + self.admin_request(path='/v2.0/tokens', method='POST', body=body) auth_data = self.build_authentication_request( user_id=self.user2['id'], password=self.user2['password'], project_id=self.project2['id']) - resp = self.post('/auth/tokens', body=auth_data) + self.post('/auth/tokens', body=auth_data) # Now disable the domain self.domain2['enabled'] = False @@ -134,26 +132,22 @@ class IdentityTestCase(test_v3.RestfulTestCase): 'tenantId': self.project2['id'] } } - resp = self.admin_request(path='/v2.0/tokens', - method='POST', - body=body, - expected_status=401) + self.admin_request( + path='/v2.0/tokens', method='POST', body=body, expected_status=401) # Try looking up in v3 by name and id auth_data = self.build_authentication_request( user_id=self.user2['id'], password=self.user2['password'], project_id=self.project2['id']) - resp = self.post('/auth/tokens', body=auth_data, - expected_status=401) + self.post('/auth/tokens', body=auth_data, expected_status=401) auth_data = self.build_authentication_request( username=self.user2['name'], user_domain_id=self.domain2['id'], password=self.user2['password'], project_id=self.project2['id']) - resp = self.post('/auth/tokens', body=auth_data, - expected_status=401) + self.post('/auth/tokens', body=auth_data, expected_status=401) def test_delete_enabled_domain_fails(self): """DELETE /domains/{domain_id}...(when domain enabled)""" diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py index 246b56dd..2cd5a30c 100644 --- a/tests/test_v3_protection.py +++ b/tests/test_v3_protection.py @@ -54,49 +54,34 @@ class IdentityTestProtectedCase(test_v3.RestfulTestCase): super(IdentityTestProtectedCase, self).setUp(load_sample_data=False) # Start by creating a couple of domains self.domainA = self.new_domain_ref() - domainA_ref = self.identity_api.create_domain(self.domainA['id'], - self.domainA) + self.identity_api.create_domain(self.domainA['id'], self.domainA) self.domainB = self.new_domain_ref() - domainB_ref = self.identity_api.create_domain(self.domainB['id'], - self.domainB) + self.identity_api.create_domain(self.domainB['id'], self.domainB) self.domainC = self.new_domain_ref() self.domainC['enabled'] = False - domainC_ref = self.identity_api.create_domain(self.domainC['id'], - self.domainC) + self.identity_api.create_domain(self.domainC['id'], self.domainC) # Now create some users, one in domainA and two of them in domainB - self.user1 = self.new_user_ref( - domain_id=self.domainA['id']) + self.user1 = self.new_user_ref(domain_id=self.domainA['id']) self.user1['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user1['id'], - self.user1) + self.identity_api.create_user(self.user1['id'], self.user1) - self.user2 = self.new_user_ref( - domain_id=self.domainB['id']) + self.user2 = self.new_user_ref(domain_id=self.domainB['id']) self.user2['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user2['id'], - self.user2) + self.identity_api.create_user(self.user2['id'], self.user2) - self.user3 = self.new_user_ref( - domain_id=self.domainB['id']) + self.user3 = self.new_user_ref(domain_id=self.domainB['id']) self.user3['password'] = uuid.uuid4().hex - user_ref = self.identity_api.create_user(self.user3['id'], - self.user3) + self.identity_api.create_user(self.user3['id'], self.user3) - self.group1 = self.new_group_ref( - domain_id=self.domainA['id']) - user_ref = self.identity_api.create_group(self.group1['id'], - self.group1) + self.group1 = self.new_group_ref(domain_id=self.domainA['id']) + self.identity_api.create_group(self.group1['id'], self.group1) - self.group2 = self.new_group_ref( - domain_id=self.domainA['id']) - user_ref = self.identity_api.create_group(self.group2['id'], - self.group2) + self.group2 = self.new_group_ref(domain_id=self.domainA['id']) + self.identity_api.create_group(self.group2['id'], self.group2) - self.group3 = self.new_group_ref( - domain_id=self.domainB['id']) - user_ref = self.identity_api.create_group(self.group3['id'], - self.group3) + self.group3 = self.new_group_ref(domain_id=self.domainB['id']) + self.identity_api.create_group(self.group3['id'], self.group3) self.role = self.new_role_ref() self.identity_api.create_role(self.role['id'], self.role) diff --git a/tox.ini b/tox.ini index e56e56d8..d8e960c0 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +30,6 @@ commands = {posargs} [flake8] show-source = true -ignore = H,F841 +ignore = H builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor -- cgit