diff --git a/tests/conftest.py b/tests/conftest.py index af1f9af..a6da66a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -32,10 +32,10 @@ class KeycloakTestEnv(object): def __init__( self, - host: str = os.environ["KEYCLOAK_HOST"], - port: str = os.environ["KEYCLOAK_PORT"], - username: str = os.environ["KEYCLOAK_ADMIN"], - password: str = os.environ["KEYCLOAK_ADMIN_PASSWORD"], + host: str = "localhost", # os.environ["KEYCLOAK_HOST"], + port: str = "8080", # os.environ["KEYCLOAK_PORT"], + username: str = "admin", # os.environ["KEYCLOAK_ADMIN"], + password: str = "admin", # os.environ["KEYCLOAK_ADMIN_PASSWORD"], ): """Init method. diff --git a/tests/test_keycloak_admin.py b/tests/test_keycloak_admin.py index 9fe8e7b..b0a5991 100644 --- a/tests/test_keycloak_admin.py +++ b/tests/test_keycloak_admin.py @@ -3769,11 +3769,11 @@ async def test_a_groups(admin: KeycloakAdmin, user: str): await admin.a_get_group_children(group_id=group_id, full_hierarchy=True, query={"max": 10}) # Test that query params are passed - if os.environ["KEYCLOAK_DOCKER_IMAGE_TAG"] == "latest" or Version( - os.environ["KEYCLOAK_DOCKER_IMAGE_TAG"] - ) >= Version("23"): - res = await admin.a_get_group_children(group_id=group_id, query={"max": 1}) - assert len(res) == 1 + # if os.environ["KEYCLOAK_DOCKER_IMAGE_TAG"] == "latest" or Version( + # os.environ["KEYCLOAK_DOCKER_IMAGE_TAG"] + # ) >= Version("23"): + res = await admin.a_get_group_children(group_id=group_id, query={"max": 1}) + assert len(res) == 1 assert err.match("Cannot use both query and full_hierarchy parameters") @@ -3841,7 +3841,7 @@ async def test_a_groups(admin: KeycloakAdmin, user: str): # Test update group res = await admin.a_update_group(group_id=subgroup_id_2, payload={"name": "new-subgroup-2"}) assert res == dict(), res - assert await admin.a_get_group(group_id=subgroup_id_2)["name"] == "new-subgroup-2" + assert (await admin.a_get_group(group_id=subgroup_id_2))["name"] == "new-subgroup-2" # test update fail with pytest.raises(KeycloakPutError) as err: @@ -4979,8 +4979,8 @@ async def test_a_enable_token_exchange(admin: KeycloakAdmin, realm: str): ) # Fetch various IDs and strings needed when creating the permission - token_exchange_permission_id = await admin.a_get_client_management_permissions( - client_id=target_client_id + token_exchange_permission_id = ( + await admin.a_get_client_management_permissions(client_id=target_client_id) )["scopePermissions"]["token-exchange"] scopes = await admin.a_get_client_authz_policy_scopes( client_id=realm_management_id, policy_id=token_exchange_permission_id diff --git a/tests/test_keycloak_uma.py b/tests/test_keycloak_uma.py index 2172e7c..6525989 100644 --- a/tests/test_keycloak_uma.py +++ b/tests/test_keycloak_uma.py @@ -520,10 +520,10 @@ async def test_a_uma_policy(uma: KeycloakUMA, admin: KeycloakAdmin): policies = await uma.a_policy_query(resource=resource_id) assert len(policies) == 2 - uma.a_resource_set_delete(resource_id) - admin.delete_client(other_client_id) - admin.delete_realm_role(role_id) - admin.delete_group(group_id) + await uma.a_resource_set_delete(resource_id) + await admin.a_delete_client(other_client_id) + await admin.a_delete_realm_role(role_id) + await admin.a_delete_group(group_id) @pytest.mark.asyncio