Remove last vestiges of mock.mock (#3830)

* Remove last vestiges of mock.mock

With the minimum Python version now being high enough to drop the usage
of the external mock module, switch to unittest.mock everywhere.

Switch ayncio test_credentials to AsyncMock.

* Remove new mock usage

This change snuck into master, change it to unittest.mock as well.

* Fix async mock in credential provider tests

---------

Co-authored-by: petyaslavova <[email protected]>

Author: s-t-e-v-e-n-k

dev_requirements.txt

@@ -2,8 +2,6 @@ build
 build==1.2.2.post1 ; platform_python_implementation == "PyPy"
 click==8.0.4
 invoke==2.2.0
-mock
-mock==5.1.0 ; platform_python_implementation == "PyPy"
 packaging>=20.4
 packaging==24.2 ; platform_python_implementation == "PyPy"
 

tests/test_asyncio/test_command_policies.py

@@ -1,7 +1,7 @@
 import random
+from unittest.mock import patch
 
 import pytest
-from mock import patch
 
 from redis import ResponseError
 from redis._parsers.commands import CommandPolicies, RequestPolicy, ResponsePolicy

tests/test_asyncio/test_credentials.py

@@ -4,11 +4,11 @@
 from asyncio import Lock as AsyncLock
 from asyncio import sleep as async_sleep
 from typing import Optional, Tuple, Union
+from unittest.mock import AsyncMock, call
 
 import pytest
 import pytest_asyncio
 import redis
-from mock.mock import Mock, call
 from redis import AuthenticationError, DataError, RedisError, ResponseError
 from redis.asyncio import Connection, ConnectionPool, Redis
 from redis.asyncio.retry import Retry
@@ -340,10 +340,10 @@ class TestStreamingCredentialProvider:
         indirect=True,
     )
     async def test_async_re_auth_all_connections(self, credential_provider):
-        mock_connection = Mock(spec=Connection)
+        mock_connection = AsyncMock(spec=Connection)
         mock_connection.retry = Retry(NoBackoff(), 0)
-        mock_another_connection = Mock(spec=Connection)
-        mock_pool = Mock(spec=ConnectionPool)
+        mock_another_connection = AsyncMock(spec=Connection)
+        mock_pool = AsyncMock(spec=ConnectionPool)
         mock_pool.connection_kwargs = {
             "credential_provider": credential_provider,
         }
@@ -391,16 +391,16 @@ async def re_auth_callback(token):
         indirect=True,
     )
     async def test_async_re_auth_partial_connections(self, credential_provider):
-        mock_connection = Mock(spec=Connection)
+        mock_connection = AsyncMock(spec=Connection)
         mock_connection.retry = Retry(NoBackoff(), 3)
-        mock_another_connection = Mock(spec=Connection)
+        mock_another_connection = AsyncMock(spec=Connection)
         mock_another_connection.retry = Retry(NoBackoff(), 3)
-        mock_failed_connection = Mock(spec=Connection)
+        mock_failed_connection = AsyncMock(spec=Connection)
         mock_failed_connection.read_response.side_effect = ConnectionError(
             "Failed auth"
         )
         mock_failed_connection.retry = Retry(NoBackoff(), 3)
-        mock_pool = Mock(spec=ConnectionPool)
+        mock_pool = AsyncMock(spec=ConnectionPool)
         mock_pool.connection_kwargs = {
             "credential_provider": credential_provider,
         }
@@ -454,21 +454,28 @@ async def re_auth_callback(token):
         indirect=True,
     )
     async def test_re_auth_pub_sub_in_resp3(self, credential_provider):
-        mock_pubsub_connection = Mock(spec=Connection)
+        mock_pubsub_connection = AsyncMock(spec=Connection)
         mock_pubsub_connection.get_protocol.return_value = 3
         mock_pubsub_connection.credential_provider = credential_provider
         mock_pubsub_connection.retry = Retry(NoBackoff(), 3)
-        mock_another_connection = Mock(spec=Connection)
+        mock_another_connection = AsyncMock(spec=Connection)
         mock_another_connection.retry = Retry(NoBackoff(), 3)
 
-        mock_pool = Mock(spec=ConnectionPool)
+        mock_pool = AsyncMock(spec=ConnectionPool)
         mock_pool.connection_kwargs = {
             "credential_provider": credential_provider,
         }
-        mock_pool.get_connection.side_effect = [
-            mock_pubsub_connection,
-            mock_another_connection,
-        ]
+
+        async def get_connection_side_effect():
+            if not hasattr(get_connection_side_effect, "call_count"):
+                get_connection_side_effect.call_count = 0
+            result = [mock_pubsub_connection, mock_another_connection][
+                get_connection_side_effect.call_count
+            ]
+            get_connection_side_effect.call_count += 1
+            return result
+
+        mock_pool.get_connection = AsyncMock(side_effect=get_connection_side_effect)
         mock_pool._available_connections = [mock_another_connection]
         mock_pool._lock = AsyncLock()
         auth_token = None
@@ -516,21 +523,28 @@ async def re_auth_callback(token):
         indirect=True,
     )
     async def test_do_not_re_auth_pub_sub_in_resp2(self, credential_provider):
-        mock_pubsub_connection = Mock(spec=Connection)
+        mock_pubsub_connection = AsyncMock(spec=Connection)
         mock_pubsub_connection.get_protocol.return_value = 2
         mock_pubsub_connection.credential_provider = credential_provider
         mock_pubsub_connection.retry = Retry(NoBackoff(), 3)
-        mock_another_connection = Mock(spec=Connection)
+        mock_another_connection = AsyncMock(spec=Connection)
         mock_another_connection.retry = Retry(NoBackoff(), 3)
 
-        mock_pool = Mock(spec=ConnectionPool)
+        mock_pool = AsyncMock(spec=ConnectionPool)
         mock_pool.connection_kwargs = {
             "credential_provider": credential_provider,
         }
-        mock_pool.get_connection.side_effect = [
-            mock_pubsub_connection,
-            mock_another_connection,
-        ]
+
+        async def get_connection_side_effect():
+            if not hasattr(get_connection_side_effect, "call_count"):
+                get_connection_side_effect.call_count = 0
+            result = [mock_pubsub_connection, mock_another_connection][
+                get_connection_side_effect.call_count
+            ]
+            get_connection_side_effect.call_count += 1
+            return result
+
+        mock_pool.get_connection = AsyncMock(side_effect=get_connection_side_effect)
         mock_pool._available_connections = [mock_another_connection]
         mock_pool._lock = AsyncLock()
         auth_token = None
@@ -583,10 +597,10 @@ async def test_fails_on_token_renewal(self, credential_provider):
             RequestTokenErr,
             RequestTokenErr,
         ]
-        mock_connection = Mock(spec=Connection)
+        mock_connection = AsyncMock(spec=Connection)
         mock_connection.retry = Retry(NoBackoff(), 0)
-        mock_another_connection = Mock(spec=Connection)
-        mock_pool = Mock(spec=ConnectionPool)
+        mock_another_connection = AsyncMock(spec=Connection)
+        mock_pool = AsyncMock(spec=ConnectionPool)
         mock_pool.connection_kwargs = {
             "credential_provider": credential_provider,
         }

tests/test_asyncio/test_multidb/test_healthcheck.py

@@ -1,5 +1,6 @@
+from unittest.mock import AsyncMock, Mock
+
 import pytest
-from mock.mock import AsyncMock, Mock
 
 from redis.asyncio.multidb.database import Database
 from redis.asyncio.multidb.healthcheck import (

tests/test_credentials.py

@@ -4,10 +4,10 @@
 import threading
 from time import sleep
 from typing import Optional, Tuple, Union
+from unittest.mock import Mock, call
 
 import pytest
 import redis
-from mock.mock import Mock, call
 from redis import AuthenticationError, DataError, Redis, ResponseError
 from redis.auth.err import RequestTokenErr
 from redis.backoff import NoBackoff