Normalize to using mock.mock everywhere instead of mixing and matching.

Author: akx

dev_requirements.txt

@@ -5,7 +5,7 @@ flake8-isort
 flake8
 flynt~=0.69.0
 invoke==2.2.0
-mock
+mock~=5.1.0
 packaging>=20.4
 pytest
 pytest-asyncio>=0.23.0,<0.24.0

tests/conftest.py

@@ -7,11 +7,11 @@
 from enum import Enum
 from typing import Callable, TypeVar, Union
 from unittest import mock
-from unittest.mock import Mock
 from urllib.parse import urlparse
 
 import pytest
 import redis
+from mock.mock import Mock
 from packaging.version import Version
 from redis import Sentinel
 from redis.auth.idp import IdentityProviderInterface

tests/test_asyncio/compat.py

@@ -1,11 +1,3 @@
-import asyncio
-from unittest import mock
-
-try:
-    mock.AsyncMock
-except AttributeError:
-    from unittest import mock
-
 try:
     from contextlib import aclosing
 except ImportError:
@@ -17,7 +9,3 @@ async def aclosing(thing):
             yield thing
         finally:
             await thing.aclose()
-
-
-def create_task(coroutine):
-    return asyncio.create_task(coroutine)

tests/test_asyncio/conftest.py

@@ -3,6 +3,7 @@
 from datetime import datetime, timezone
 from enum import Enum
 from typing import Union
+from unittest import mock
 
 import pytest
 import pytest_asyncio
@@ -36,8 +37,6 @@
 )
 from tests.conftest import REDIS_INFO
 
-from .compat import mock
-
 
 class AuthType(Enum):
     MANAGED_IDENTITY = "managed_identity"

tests/test_asyncio/test_cluster.py

@@ -4,6 +4,7 @@
 import ssl
 import warnings
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Type, Union
+from unittest import mock
 from urllib.parse import urlparse
 
 import pytest
@@ -38,7 +39,7 @@
 )
 
 from ..ssl_utils import get_tls_certificates
-from .compat import aclosing, mock
+from .compat import aclosing
 
 pytestmark = pytest.mark.onlycluster
 

tests/test_asyncio/test_connection.py

@@ -2,10 +2,11 @@
 import socket
 import types
 from errno import ECONNREFUSED
-from unittest.mock import patch
+from unittest import mock
 
 import pytest
 import redis
+from mock.mock import patch
 from redis._parsers import (
     _AsyncHiredisParser,
     _AsyncRESP2Parser,
@@ -25,7 +26,6 @@
 from redis.utils import HIREDIS_AVAILABLE
 from tests.conftest import skip_if_server_version_lt
 
-from .compat import mock
 from .mocks import MockStream
 
 

tests/test_asyncio/test_connection_pool.py

@@ -1,6 +1,7 @@
 import asyncio
 import re
 from contextlib import asynccontextmanager
+from unittest import mock
 
 import pytest
 import pytest_asyncio
@@ -9,7 +10,7 @@
 from redis.auth.token import TokenInterface
 from tests.conftest import skip_if_redis_enterprise, skip_if_server_version_lt
 
-from .compat import aclosing, mock
+from .compat import aclosing
 from .test_pubsub import wait_for_message
 
 

tests/test_asyncio/test_pipeline.py

@@ -1,8 +1,10 @@
+from unittest import mock
+
 import pytest
 import redis
 from tests.conftest import skip_if_server_version_lt
 
-from .compat import aclosing, mock
+from .compat import aclosing
 from .conftest import wait_for_command
 
 

tests/test_asyncio/test_pubsub.py

@@ -3,7 +3,8 @@
 import socket
 import sys
 from typing import Optional
-from unittest.mock import patch
+
+from mock.mock import patch
 
 # the functionality is available in 3.11.x but has a major issue before
 # 3.11.3. See https://github.com/redis/redis-py/issues/2633
@@ -20,7 +21,7 @@
 from redis.utils import HIREDIS_AVAILABLE
 from tests.conftest import get_protocol_version, skip_if_server_version_lt
 
-from .compat import aclosing, create_task, mock
+from .compat import aclosing
 
 
 def with_timeout(t):
@@ -733,7 +734,7 @@ async def loop_step():
                 await messages.put(message)
                 break
 
-        task = asyncio.get_running_loop().create_task(loop())
+        task = asyncio.create_task(loop())
         # get the initial connect message
         async with async_timeout(1):
             message = await messages.get()
@@ -782,7 +783,7 @@ def callback(message):
         messages = asyncio.Queue()
         p = pubsub
         await self._subscribe(p, foo=callback)
-        task = asyncio.get_running_loop().create_task(p.run())
+        task = asyncio.create_task(p.run())
         await r.publish("foo", "bar")
         message = await messages.get()
         task.cancel()
@@ -805,8 +806,8 @@ def exception_handler_callback(e, pubsub) -> None:
         exceptions = asyncio.Queue()
         p = pubsub
         await self._subscribe(p, foo=lambda x: None)
-        with mock.patch.object(p, "get_message", side_effect=Exception("error")):
-            task = asyncio.get_running_loop().create_task(
+        with patch.object(p, "get_message", side_effect=Exception("error")):
+            task = asyncio.create_task(
                 p.run(exception_handler=exception_handler_callback)
             )
             e = await exceptions.get()
@@ -823,7 +824,7 @@ def callback(message):
 
         messages = asyncio.Queue()
         p = pubsub
-        task = asyncio.get_running_loop().create_task(p.run())
+        task = asyncio.create_task(p.run())
         # wait until loop gets settled.  Add a subscription
         await asyncio.sleep(0.1)
         await p.subscribe(foo=callback)
@@ -867,7 +868,7 @@ async def mysetup(self, r, method):
         else:
             self.get_message = self.loop_step_listen
 
-        self.task = create_task(self.loop())
+        self.task = asyncio.create_task(self.loop())
         # get the initial connect message
         message = await self.messages.get()
         assert message == {
@@ -903,7 +904,7 @@ async def test_reconnect_socket_error(self, r: redis.Redis, method):
                 async with self.cond:
                     assert self.state == 0
                     self.state = 1
-                    with mock.patch.object(self.pubsub.connection, "_parser") as m:
+                    with patch.object(self.pubsub.connection, "_parser") as m:
                         m.read_response.side_effect = socket.error
                         m.can_read_destructive.side_effect = socket.error
                         # wait until task noticies the disconnect until we

tests/test_asyncio/test_sentinel_managed_connection.py

@@ -1,12 +1,11 @@
 import socket
+from unittest import mock
 
 import pytest
 from redis.asyncio.retry import Retry
 from redis.asyncio.sentinel import SentinelManagedConnection
 from redis.backoff import NoBackoff
 
-from .compat import mock
-
 pytestmark = pytest.mark.asyncio