Unverified Commit fff7a92d authored by marius-mather's avatar marius-mather
Browse files

Update unit tests to use attribute access

parent c11e7529

lib/galaxy/authnz/psa_authnz.py

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class PSAAuthnz(IdentityProvider): 


        self.config[setting_name("USER_MODEL")] = "models.User"

        # Use a custom auth pipeline if configured.

        auth_pipeline = app_config.get("oidc_auth_pipeline", AUTH_PIPELINE)

        auth_pipeline = app_config.oidc_auth_pipeline or AUTH_PIPELINE

        # Add extra steps to the auth pipeline if configured.

        if app_config.oidc_auth_pipeline_extra:

            auth_pipeline = auth_pipeline + tuple(app_config.oidc_auth_pipeline_extra)

test/unit/authnz/test_psa_authnz.py

+15 −12
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ from datetime import ( 
    datetime,

    timedelta,

)

from types import SimpleNamespace

from typing import Optional

from unittest.mock import MagicMock
@@ -287,10 +288,11 @@ def test_decode_access_token_opaque_token(): 
def test_oidc_config_custom_auth_pipeline(mock_oidc_config_file, mock_oidc_backend_config_file):

    custom_auth_pipeline = ("custom", "auth", "steps")

    mock_app = MagicMock()

    mock_app.config.get.side_effect = lambda k, default=None: {"oidc_auth_pipeline": custom_auth_pipeline}.get(

        k, default

    mock_app.config = SimpleNamespace(

        oidc_auth_pipeline=custom_auth_pipeline,

        oidc_auth_pipeline_extra=None,

        oidc=defaultdict(dict),

    )

    mock_app.config.oidc = defaultdict(dict)

    manager = AuthnzManager(

        app=mock_app, oidc_config_file=mock_oidc_config_file, oidc_backends_config_file=mock_oidc_backend_config_file

    )
@@ -309,10 +311,11 @@ def test_oidc_config_auth_pipeline_extra(mock_oidc_config_file, mock_oidc_backen 
    """

    custom_auth_pipeline_extra = ["extra", "auth", "steps"]

    mock_app = MagicMock()

    mock_app.config.get.side_effect = lambda k, default=None: {

        "oidc_auth_pipeline_extra": custom_auth_pipeline_extra

    }.get(k, default)

    mock_app.config.oidc = defaultdict(dict)

    mock_app.config = SimpleNamespace(

        oidc_auth_pipeline=None,

        oidc_auth_pipeline_extra=custom_auth_pipeline_extra,

        oidc=defaultdict(dict),

    )

    manager = AuthnzManager(

        app=mock_app, oidc_config_file=mock_oidc_config_file, oidc_backends_config_file=mock_oidc_backend_config_file

    )
@@ -333,11 +336,11 @@ def test_oidc_config_custom_auth_pipeline_and_extra(mock_oidc_config_file, mock_ 
    custom_auth_pipeline = ("custom", "auth", "steps")

    custom_auth_pipeline_extra = ["extra", "auth", "steps"]

    mock_app = MagicMock()

    mock_app.config.get.side_effect = lambda k, default=None: {

        "oidc_auth_pipeline": custom_auth_pipeline,

        "oidc_auth_pipeline_extra": custom_auth_pipeline_extra,

    }.get(k, default)

    mock_app.config.oidc = defaultdict(dict)

    mock_app.config = SimpleNamespace(

        oidc_auth_pipeline=custom_auth_pipeline,

        oidc_auth_pipeline_extra=custom_auth_pipeline_extra,

        oidc=defaultdict(dict),

    )

    manager = AuthnzManager(

        app=mock_app, oidc_config_file=mock_oidc_config_file, oidc_backends_config_file=mock_oidc_backend_config_file

    )