Fix inheritance order; add tests

Author: sfc-gh-pczajka

src/snowflake/connector/aio/auth/_workload_identity.py

@@ -13,7 +13,7 @@
 from ._by_plugin import AuthByPlugin as AuthByPluginAsync
 
 
-class AuthByWorkloadIdentity(AuthByWorkloadIdentitySync, AuthByPluginAsync):
+class AuthByWorkloadIdentity(AuthByPluginAsync, AuthByWorkloadIdentitySync):
     """Plugin to authenticate via workload identity."""
 
     def __init__(

test/unit/aio/test_auth_async.py

@@ -330,3 +330,13 @@ async def test_authbyplugin_abc_api():
 'password': <Parameter "password: 'str'">, \
 'kwargs': <Parameter "**kwargs: 'Any'">})"""
         )
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByDefault.mro().index(AuthByPluginAsync) < AuthByDefault.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_keypair_async.py

@@ -130,6 +130,16 @@ async def test_renew_token(mockPrepare):
     assert mockPrepare.called
 
 
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByKeyPair.mro().index(AuthByPluginAsync) < AuthByKeyPair.mro().index(
+        AuthByPluginSync
+    )
+
+
 def _init_rest(application, post_requset):
     connection = mock_connection()
     connection.errorhandler = Mock(return_value=None)

test/unit/aio/test_auth_no_auth_async.py

@@ -39,3 +39,14 @@ async def test_auth_no_auth():
     assert (
         reauth_response == expected_reauth_response
     ), f'reauthenticate(foo="bar") is expected to return {expected_reauth_response}, but returns {reauth_response}'
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.aio.auth._no_auth import AuthNoAuth
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthNoAuth.mro().index(AuthByPluginAsync) < AuthNoAuth.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_oauth_async.py

@@ -16,3 +16,13 @@ async def test_auth_oauth():
     await auth.update_body(body)
     assert body["data"]["TOKEN"] == token, body
     assert body["data"]["AUTHENTICATOR"] == "OAUTH", body
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByOAuth.mro().index(AuthByPluginAsync) < AuthByOAuth.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_okta_async.py

@@ -346,3 +346,13 @@ async def post_request(url, headers, body, **kwargs):
     connection._rest = rest
     rest._post_request = post_request
     return rest
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByOkta.mro().index(AuthByPluginAsync) < AuthByOkta.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_pat_async.py

@@ -70,3 +70,13 @@ async def mock_post_request(request, url, headers, json_body, **kwargs):
     assert isinstance(conn.auth_class, AuthByPAT)
 
     await conn.close()
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByPAT.mro().index(AuthByPluginAsync) < AuthByPAT.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_usrpwdmfa_async.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2012-2023 Snowflake Computing Inc. All rights reserved.
+#
+
+from __future__ import annotations
+
+from snowflake.connector.aio.auth._usrpwdmfa import AuthByUsrPwdMfa
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByUsrPwdMfa.mro().index(AuthByPluginAsync) < AuthByUsrPwdMfa.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_webbrowser_async.py

@@ -871,3 +871,17 @@ async def test_auth_webbrowser_socket_reuseport_option_not_set_with_no_flag(
 
         assert not rest._connection.errorhandler.called  # no error
         assert auth.assertion_content == ref_token
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByWebBrowser.mro().index(
+        AuthByPluginAsync
+    ) < AuthByWebBrowser.mro().index(AuthByPluginSync)
+
+    assert AuthByIdToken.mro().index(AuthByPluginAsync) < AuthByIdToken.mro().index(
+        AuthByPluginSync
+    )

test/unit/aio/test_auth_workload_identity_async.py

@@ -380,3 +380,13 @@ async def test_autodetect_no_provider_raises_error(no_metadata_service):
     assert "No workload identity credential was found for 'auto-detect" in str(
         excinfo.value
     )
+
+
+def test_mro():
+    """Ensure that methods from AuthByPluginAsync override those from AuthByPlugin."""
+    from snowflake.connector.aio.auth import AuthByPlugin as AuthByPluginAsync
+    from snowflake.connector.auth import AuthByPlugin as AuthByPluginSync
+
+    assert AuthByWorkloadIdentity.mro().index(
+        AuthByPluginAsync
+    ) < AuthByWorkloadIdentity.mro().index(AuthByPluginSync)