support AsyncMock for 3.7

Author: daniel-sanche

tests/transport/aio/test_aiohttp.py

@@ -13,8 +13,12 @@
 # limitations under the License.
 
 import asyncio
-from unittest.mock import AsyncMock, Mock, patch
-
+from unittest.mock import Mock, patch
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 from aioresponses import aioresponses  # type: ignore
 import pytest  # type: ignore
 import pytest_asyncio  # type: ignore

tests_async/oauth2/test__client_async.py

@@ -16,6 +16,11 @@
 import http.client as http_client
 import json
 from unittest import mock
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 import urllib
 
 import pytest  # type: ignore
@@ -29,13 +34,13 @@
 
 
 def make_request(response_data, status=http_client.OK, text=False):
-    response = mock.AsyncMock(spec=["transport.Response"])
+    response = AsyncMock(spec=["transport.Response"])
     response.status = status
     data = response_data if text else json.dumps(response_data).encode("utf-8")
-    response.data = mock.AsyncMock(spec=["__call__", "read"])
-    response.data.read = mock.AsyncMock(spec=["__call__"], return_value=data)
-    response.content = mock.AsyncMock(spec=["__call__"], return_value=data)
-    request = mock.AsyncMock(spec=["transport.Request"])
+    response.data = AsyncMock(spec=["__call__", "read"])
+    response.data.read = AsyncMock(spec=["__call__"], return_value=data)
+    response.content = AsyncMock(spec=["__call__"], return_value=data)
+    request = AsyncMock(spec=["transport.Request"])
     request.return_value = response
     return request
 
@@ -142,21 +147,21 @@ async def test__token_endpoint_request_internal_failure_error():
 
 @pytest.mark.asyncio
 async def test__token_endpoint_request_internal_failure_and_retry_failure_error():
-    retryable_error = mock.AsyncMock(spec=["transport.Response"])
+    retryable_error = AsyncMock(spec=["transport.Response"])
     retryable_error.status = http_client.BAD_REQUEST
     data = json.dumps({"error_description": "internal_failure"}).encode("utf-8")
-    retryable_error.data = mock.AsyncMock(spec=["__call__", "read"])
-    retryable_error.data.read = mock.AsyncMock(spec=["__call__"], return_value=data)
-    retryable_error.content = mock.AsyncMock(spec=["__call__"], return_value=data)
+    retryable_error.data = AsyncMock(spec=["__call__", "read"])
+    retryable_error.data.read = AsyncMock(spec=["__call__"], return_value=data)
+    retryable_error.content = AsyncMock(spec=["__call__"], return_value=data)
 
-    unretryable_error = mock.AsyncMock(spec=["transport.Response"])
+    unretryable_error = AsyncMock(spec=["transport.Response"])
     unretryable_error.status = http_client.BAD_REQUEST
     data = json.dumps({"error_description": "invalid_scope"}).encode("utf-8")
-    unretryable_error.data = mock.AsyncMock(spec=["__call__", "read"])
-    unretryable_error.data.read = mock.AsyncMock(spec=["__call__"], return_value=data)
-    unretryable_error.content = mock.AsyncMock(spec=["__call__"], return_value=data)
+    unretryable_error.data = AsyncMock(spec=["__call__", "read"])
+    unretryable_error.data.read = AsyncMock(spec=["__call__"], return_value=data)
+    unretryable_error.content = AsyncMock(spec=["__call__"], return_value=data)
 
-    request = mock.AsyncMock(spec=["transport.Request"])
+    request = AsyncMock(spec=["transport.Request"])
     request.side_effect = [retryable_error, retryable_error, unretryable_error]
 
     with pytest.raises(exceptions.RefreshError):
@@ -170,21 +175,21 @@ async def test__token_endpoint_request_internal_failure_and_retry_failure_error(
 
 @pytest.mark.asyncio
 async def test__token_endpoint_request_internal_failure_and_retry_succeeds():
-    retryable_error = mock.AsyncMock(spec=["transport.Response"])
+    retryable_error = AsyncMock(spec=["transport.Response"])
     retryable_error.status = http_client.BAD_REQUEST
     data = json.dumps({"error_description": "internal_failure"}).encode("utf-8")
-    retryable_error.data = mock.AsyncMock(spec=["__call__", "read"])
-    retryable_error.data.read = mock.AsyncMock(spec=["__call__"], return_value=data)
-    retryable_error.content = mock.AsyncMock(spec=["__call__"], return_value=data)
+    retryable_error.data = AsyncMock(spec=["__call__", "read"])
+    retryable_error.data.read = AsyncMock(spec=["__call__"], return_value=data)
+    retryable_error.content = AsyncMock(spec=["__call__"], return_value=data)
 
-    response = mock.AsyncMock(spec=["transport.Response"])
+    response = AsyncMock(spec=["transport.Response"])
     response.status = http_client.OK
     data = json.dumps({"hello": "world"}).encode("utf-8")
-    response.data = mock.AsyncMock(spec=["__call__", "read"])
-    response.data.read = mock.AsyncMock(spec=["__call__"], return_value=data)
-    response.content = mock.AsyncMock(spec=["__call__"], return_value=data)
+    response.data = AsyncMock(spec=["__call__", "read"])
+    response.data.read = AsyncMock(spec=["__call__"], return_value=data)
+    response.content = AsyncMock(spec=["__call__"], return_value=data)
 
-    request = mock.AsyncMock(spec=["transport.Request"])
+    request = AsyncMock(spec=["transport.Request"])
     request.side_effect = [retryable_error, response]
 
     _ = await _client._token_endpoint_request(
@@ -399,7 +404,7 @@ async def test_jwt_grant_retry_with_retry(
     mock_token_endpoint_request, mock_expiry, can_retry
 ):
     _ = await _client.jwt_grant(
-        mock.AsyncMock(), mock.Mock(), mock.Mock(), can_retry=can_retry
+        AsyncMock(), mock.Mock(), mock.Mock(), can_retry=can_retry
     )
     mock_token_endpoint_request.assert_called_with(
         mock.ANY, mock.ANY, mock.ANY, can_retry=can_retry
@@ -426,7 +431,7 @@ async def test_id_token_jwt_grant_retry_with_retry(
     mock_token_endpoint_request, mock_jwt_decode, can_retry
 ):
     _ = await _client.id_token_jwt_grant(
-        mock.AsyncMock(), mock.AsyncMock(), mock.AsyncMock(), can_retry=can_retry
+        AsyncMock(), AsyncMock(), AsyncMock(), can_retry=can_retry
     )
     mock_token_endpoint_request.assert_called_with(
         mock.ANY, mock.ANY, mock.ANY, can_retry=can_retry
@@ -440,11 +445,11 @@ async def test_refresh_grant_retry_default(
     mock_token_endpoint_request, mock_parse_expiry
 ):
     _ = await _client.refresh_grant(
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
     )
     mock_token_endpoint_request.assert_called_with(
         mock.ANY, mock.ANY, mock.ANY, can_retry=True
@@ -459,11 +464,11 @@ async def test_refresh_grant_retry_with_retry(
     mock_token_endpoint_request, mock_parse_expiry, can_retry
 ):
     _ = await _client.refresh_grant(
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
-        mock.AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
         can_retry=can_retry,
     )
     mock_token_endpoint_request.assert_called_with(
@@ -481,10 +486,10 @@ async def test__token_endpoint_request_no_throw_with_retry(can_retry):
 
     _ = await _client._token_endpoint_request_no_throw(
         mock_request,
-        mock.AsyncMock(),
+        AsyncMock(),
         "body",
-        mock.AsyncMock(),
-        mock.AsyncMock(),
+        AsyncMock(),
+        AsyncMock(),
         can_retry=can_retry,
     )
 

tests_async/oauth2/test_credentials_async.py

@@ -18,6 +18,11 @@
 import pickle
 import sys
 from unittest import mock
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 
@@ -82,7 +87,7 @@ async def test_refresh_success(self, unused_utcnow, refresh_grant):
             rapt_token,
         )
 
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
         creds = self.make_credentials()
 
         # Refresh credentials
@@ -112,7 +117,7 @@ async def test_refresh_success(self, unused_utcnow, refresh_grant):
 
     @pytest.mark.asyncio
     async def test_refresh_no_refresh_token(self):
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
         credentials_ = _credentials_async.Credentials(token=None, refresh_token=None)
 
         with pytest.raises(exceptions.RefreshError, match="necessary fields"):
@@ -147,7 +152,7 @@ async def test_credentials_with_scopes_requested_refresh_success(
             rapt_token,
         )
 
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
         creds = _credentials_async.Credentials(
             token=None,
             refresh_token=self.REFRESH_TOKEN,
@@ -211,7 +216,7 @@ async def test_credentials_with_scopes_returned_refresh_success(
             rapt_token,
         )
 
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
         creds = _credentials_async.Credentials(
             token=None,
             refresh_token=self.REFRESH_TOKEN,
@@ -278,7 +283,7 @@ async def test_credentials_with_scopes_refresh_failure_raises_refresh_error(
             rapt_token,
         )
 
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
         creds = _credentials_async.Credentials(
             token=None,
             refresh_token=self.REFRESH_TOKEN,

tests_async/oauth2/test_id_token.py

@@ -15,6 +15,11 @@
 import json
 import os
 from unittest import mock
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 
@@ -28,16 +33,16 @@
 
 
 def make_request(status, data=None):
-    response = mock.AsyncMock(spec=["transport.Response"])
+    response = AsyncMock(spec=["transport.Response"])
     response.status = status
 
     if data is not None:
-        response.data = mock.AsyncMock(spec=["__call__", "read"])
-        response.content = mock.AsyncMock(
+        response.data = AsyncMock(spec=["__call__", "read"])
+        response.content = AsyncMock(
             spec=["__call__"], return_value=json.dumps(data).encode("utf-8")
         )
 
-    request = mock.AsyncMock(spec=["transport.Request"])
+    request = AsyncMock(spec=["transport.Request"])
     request.return_value = response
     return request
 
@@ -223,7 +228,7 @@ def mock_init(self, request, audience, use_metadata_identity_endpoint):
             __init__=mock_init,
             refresh=mock.Mock(),
         ):
-            request = mock.AsyncMock()
+            request = AsyncMock()
             token = await id_token.fetch_id_token(
                 request, "https://pubsub.googleapis.com"
             )
@@ -240,7 +245,7 @@ async def mock_refresh(self, request):
     with mock.patch.object(
         _service_account_async.IDTokenCredentials, "refresh", mock_refresh
     ):
-        request = mock.AsyncMock()
+        request = AsyncMock()
         token = await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
         assert token == "id_token"
 
@@ -254,15 +259,15 @@ async def test_fetch_id_token_no_cred_exists(monkeypatch):
         side_effect=exceptions.TransportError(),
     ):
         with pytest.raises(exceptions.DefaultCredentialsError) as excinfo:
-            request = mock.AsyncMock()
+            request = AsyncMock()
             await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
         assert excinfo.match(
             r"Neither metadata server or valid service account credentials are found."
         )
 
     with mock.patch("google.auth.compute_engine._metadata.ping", return_value=False):
         with pytest.raises(exceptions.DefaultCredentialsError) as excinfo:
-            request = mock.AsyncMock()
+            request = AsyncMock()
             await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
         assert excinfo.match(
             r"Neither metadata server or valid service account credentials are found."
@@ -277,7 +282,7 @@ async def test_fetch_id_token_invalid_cred_file(monkeypatch):
     monkeypatch.setenv(environment_vars.CREDENTIALS, not_json_file)
 
     with pytest.raises(exceptions.DefaultCredentialsError) as excinfo:
-        request = mock.AsyncMock()
+        request = AsyncMock()
         await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
     assert excinfo.match(
         r"GOOGLE_APPLICATION_CREDENTIALS is not valid service account credentials."
@@ -293,7 +298,7 @@ async def test_fetch_id_token_invalid_cred_type(monkeypatch):
 
     with mock.patch("google.auth.compute_engine._metadata.ping", return_value=False):
         with pytest.raises(exceptions.DefaultCredentialsError) as excinfo:
-            request = mock.AsyncMock()
+            request = AsyncMock()
             await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
         assert excinfo.match(
             r"Neither metadata server or valid service account credentials are found."
@@ -308,7 +313,7 @@ async def test_fetch_id_token_invalid_cred_path(monkeypatch):
     monkeypatch.setenv(environment_vars.CREDENTIALS, not_json_file)
 
     with pytest.raises(exceptions.DefaultCredentialsError) as excinfo:
-        request = mock.AsyncMock()
+        request = AsyncMock()
         await id_token.fetch_id_token(request, "https://pubsub.googleapis.com")
     assert excinfo.match(
         r"GOOGLE_APPLICATION_CREDENTIALS path is either not found or invalid."

tests_async/oauth2/test_reauth_async.py

@@ -14,6 +14,11 @@
 
 import copy
 from unittest import mock
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 
@@ -22,7 +27,7 @@
 from google.oauth2 import reauth
 
 
-MOCK_REQUEST = mock.AsyncMock(spec=["transport.Request"])
+MOCK_REQUEST = AsyncMock(spec=["transport.Request"])
 CHALLENGES_RESPONSE_TEMPLATE = {
     "status": "CHALLENGE_REQUIRED",
     "sessionId": "123",

tests_async/oauth2/test_service_account_async.py

@@ -14,6 +14,11 @@
 
 import datetime
 from unittest import mock
+try:
+    from unittest.mock import AsyncMock
+except ImportError:
+    # Fallback for Python < 3.8
+    from mock import AsyncMock
 
 import pytest  # type: ignore
 
@@ -331,7 +336,7 @@ async def test_refresh_success(self, id_token_jwt_grant):
             {},
         )
 
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
 
         # Refresh credentials
         await credentials.refresh(request)
@@ -363,7 +368,7 @@ async def test_before_request_refreshes(self, id_token_jwt_grant):
             _helpers.utcnow() + datetime.timedelta(seconds=500),
             None,
         )
-        request = mock.AsyncMock(spec=["transport.Request"])
+        request = AsyncMock(spec=["transport.Request"])
 
         # Credentials should start as invalid
         assert not credentials.valid