diff --git a/keystone/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py index fbd21168b6..f4566d7db2 100644 --- a/keystone/tests/test_v3_auth.py +++ b/keystone/tests/test_v3_auth.py @@ -1523,7 +1523,7 @@ class TestAuthJSON(test_v3.RestfulTestCase): roles_ids = [] for ref in token['roles']: roles_ids.append(ref['id']) - self.assertEqual(len(token['roles']), 2) + self.assertEqual(2, len(token['roles'])) self.assertIn(role_list[1]['id'], roles_ids) self.assertIn(role_list[5]['id'], roles_ids) @@ -1537,7 +1537,7 @@ class TestAuthJSON(test_v3.RestfulTestCase): roles_ids = [] for ref in token['roles']: roles_ids.append(ref['id']) - self.assertEqual(len(token['roles']), 2) + self.assertEqual(2, len(token['roles'])) self.assertIn(role_list[0]['id'], roles_ids) self.assertIn(role_list[4]['id'], roles_ids) @@ -1555,7 +1555,7 @@ class TestAuthJSON(test_v3.RestfulTestCase): roles_ids = [] for ref in token['roles']: roles_ids.append(ref['id']) - self.assertEqual(len(token['roles']), 3) + self.assertEqual(3, len(token['roles'])) self.assertIn(role_list[1]['id'], roles_ids) self.assertIn(role_list[5]['id'], roles_ids) self.assertIn(role_list[7]['id'], roles_ids) @@ -2400,19 +2400,19 @@ class TestTrustAuth(TestAuthInfo): r = self.get('/OS-TRUST/trusts', expected_status=200) trusts = r.result['trusts'] - self.assertEqual(len(trusts), 3) + self.assertEqual(3, len(trusts)) self.assertValidTrustListResponse(r) r = self.get('/OS-TRUST/trusts?trustor_user_id=%s' % self.user_id, expected_status=200) trusts = r.result['trusts'] - self.assertEqual(len(trusts), 3) + self.assertEqual(3, len(trusts)) self.assertValidTrustListResponse(r) r = self.get('/OS-TRUST/trusts?trustee_user_id=%s' % self.user_id, expected_status=200) trusts = r.result['trusts'] - self.assertEqual(len(trusts), 0) + self.assertEqual(0, len(trusts)) def test_change_password_invalidates_trust_tokens(self): ref = self.new_trust_ref( @@ -2503,4 +2503,4 @@ class TestAPIProtectionWithoutAuthContextMiddleware(test_v3.RestfulTestCase): 'query_string': {}, 'environment': {}} r = auth_controller.validate_token(context) - self.assertEqual(r.status_code, 200) + self.assertEqual(200, r.status_code) diff --git a/keystone/tests/test_v3_identity.py b/keystone/tests/test_v3_identity.py index 7b9916edf6..323023c8b0 100644 --- a/keystone/tests/test_v3_identity.py +++ b/keystone/tests/test_v3_identity.py @@ -622,7 +622,7 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.credential['id']) # And the no tokens we remain valid tokens = self.token_api._list_tokens(self.user['id']) - self.assertEqual(len(tokens), 0) + self.assertEqual(0, len(tokens)) # But the credential for user2 is unaffected r = self.credential_api.get_credential(self.credential2['id']) self.assertDictEqual(r, self.credential2) @@ -846,8 +846,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(gd_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 1) + self.assertEqual(existing_assignments + 1, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) ud_url, ud_entity = _build_role_assignment_url_and_entity( @@ -856,8 +856,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(ud_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 2) + self.assertEqual(existing_assignments + 2, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) gp_url, gp_entity = _build_role_assignment_url_and_entity( @@ -866,8 +866,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(gp_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 3) + self.assertEqual(existing_assignments + 3, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gp_entity, link_url=gp_url) up_url, up_entity = _build_role_assignment_url_and_entity( @@ -876,8 +876,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(up_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 4) + self.assertEqual(existing_assignments + 4, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) # Now delete the four we added and make sure they are removed @@ -889,8 +889,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.delete(up_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments) + self.assertEqual(existing_assignments, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentNotInListResponse(r, gd_entity) self.assertRoleAssignmentNotInListResponse(r, ud_entity) self.assertRoleAssignmentNotInListResponse(r, gp_entity) @@ -933,8 +933,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(gd_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 1) + self.assertEqual(existing_assignments + 1, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) # Now re-read the collection asking for effective roles - this @@ -943,8 +943,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): collection_url = '/role_assignments?effective' r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 2) + self.assertEqual(existing_assignments + 2, + len(r.result.get('role_assignments'))) unused, ud_entity = _build_role_assignment_url_and_entity( domain_id=self.domain_id, user_id=self.user1['id'], role_id=self.role_id) @@ -1005,8 +1005,8 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.put(gd_url) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 1) + self.assertEqual(existing_assignments + 1, + len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) # Now re-read the collection asking for effective roles, @@ -1016,15 +1016,15 @@ class IdentityTestCase(test_v3.RestfulTestCase): collection_url = '/role_assignments?effective' r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 2) + self.assertEqual(existing_assignments + 2, + len(r.result.get('role_assignments'))) # Now set 'effective' to false explicitly - should get # back the regular roles collection_url = '/role_assignments?effective=0' r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 1) + self.assertEqual(existing_assignments + 1, + len(r.result.get('role_assignments'))) # Now try setting 'effective' to 'False' explicitly- this is # NOT supported as a way of setting a query or filter # parameter to false by design. Hence we should get back @@ -1032,14 +1032,14 @@ class IdentityTestCase(test_v3.RestfulTestCase): collection_url = '/role_assignments?effective=False' r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 2) + self.assertEqual(existing_assignments + 2, + len(r.result.get('role_assignments'))) # Now set 'effective' to True explicitly collection_url = '/role_assignments?effective=True' r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), - existing_assignments + 2) + self.assertEqual(existing_assignments + 2, + len(r.result.get('role_assignments'))) def test_filtered_role_assignments(self): """Call ``GET /role_assignments?filters``. @@ -1114,7 +1114,7 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.project1['id']) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, gp_entity, link_url=gp_url) @@ -1122,28 +1122,28 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.domain['id']) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) collection_url = '/role_assignments?user.id=%s' % self.user1['id'] r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) collection_url = '/role_assignments?group.id=%s' % self.group1['id'] r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) self.assertRoleAssignmentInListResponse(r, gp_entity, link_url=gp_url) collection_url = '/role_assignments?role.id=%s' % self.role1['id'] r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, gd_entity, link_url=gd_url) self.assertRoleAssignmentInListResponse(r, gp_entity, link_url=gp_url) @@ -1156,7 +1156,7 @@ class IdentityTestCase(test_v3.RestfulTestCase): 'project_id': self.project1['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 1) + self.assertEqual(1, len(r.result.get('role_assignments'))) self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) # Now for a harder one - filter for user with effective @@ -1167,7 +1167,7 @@ class IdentityTestCase(test_v3.RestfulTestCase): self.user1['id']) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 4) + self.assertEqual(4, len(r.result.get('role_assignments'))) # Should have the two direct roles... self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, ud_entity, link_url=ud_url) @@ -1200,7 +1200,7 @@ class IdentityTestCase(test_v3.RestfulTestCase): 'project_id': self.project1['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) # Should have one direct role and one from group membership... self.assertRoleAssignmentInListResponse(r, up_entity, link_url=up_url) self.assertRoleAssignmentInListResponse(r, up1_entity, @@ -1316,7 +1316,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): 'domain_id': domain['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 1) + self.assertEqual(1, len(r.result.get('role_assignments'))) ud_url, ud_entity = _build_role_assignment_url_and_entity( domain_id=domain['id'], user_id=user1['id'], role_id=role_list[3]['id'], inherited_to_projects=True) @@ -1332,7 +1332,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): 'project_id': project1['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 3) + self.assertEqual(3, len(r.result.get('role_assignments'))) # An effective role for an inherited role will be a project # entity, with a domain link to the inherited assignment unused, up_entity = _build_role_assignment_url_and_entity( @@ -1410,7 +1410,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): 'project_id': project1['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 3) + self.assertEqual(3, len(r.result.get('role_assignments'))) unused, up_entity = _build_role_assignment_url_and_entity( project_id=project1['id'], user_id=user1['id'], @@ -1425,7 +1425,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): self.opt_in_group('os_inherit', enabled=False) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) unused, up_entity = _build_role_assignment_url_and_entity( project_id=project1['id'], user_id=user1['id'], @@ -1514,7 +1514,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): 'domain_id': domain['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 1) + self.assertEqual(1, len(r.result.get('role_assignments'))) gd_url, gd_entity = _build_role_assignment_url_and_entity( domain_id=domain['id'], group_id=group1['id'], role_id=role_list[3]['id'], inherited_to_projects=True) @@ -1530,7 +1530,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): 'project_id': project1['id']}) r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 3) + self.assertEqual(3, len(r.result.get('role_assignments'))) # An effective role for an inherited role will be a project # entity, with a domain link to the inherited assignment unused, up_entity = _build_role_assignment_url_and_entity( @@ -1623,7 +1623,7 @@ class IdentityInheritanceTestCase(test_v3.RestfulTestCase): '/role_assignments?scope.OS-INHERIT:inherited_to=projects') r = self.get(collection_url) self.assertValidRoleAssignmentListResponse(r) - self.assertEqual(len(r.result.get('role_assignments')), 2) + self.assertEqual(2, len(r.result.get('role_assignments'))) ud_url, ud_entity = _build_role_assignment_url_and_entity( domain_id=domain['id'], user_id=user1['id'], role_id=role_list[3]['id'], inherited_to_projects=True)