diff --git a/tests/test_asyncio/compat.py b/tests/test_asyncio/compat.py index aa1dc49af0..97c62c53c3 100644 --- a/tests/test_asyncio/compat.py +++ b/tests/test_asyncio/compat.py @@ -1,10 +1,4 @@ import asyncio -from unittest import mock - -try: - mock.AsyncMock -except AttributeError: - from unittest import mock try: from contextlib import aclosing diff --git a/tests/test_asyncio/conftest.py b/tests/test_asyncio/conftest.py index 340d146ea3..7ebc2190df 100644 --- a/tests/test_asyncio/conftest.py +++ b/tests/test_asyncio/conftest.py @@ -1,6 +1,7 @@ import random from contextlib import asynccontextmanager as _asynccontextmanager from typing import Union +from unittest import mock import pytest import pytest_asyncio @@ -14,8 +15,6 @@ from redis.credentials import CredentialProvider from tests.conftest import REDIS_INFO, get_credential_provider -from .compat import mock - async def _get_info(redis_url): client = redis.Redis.from_url(redis_url) diff --git a/tests/test_asyncio/test_cluster.py b/tests/test_asyncio/test_cluster.py index 7f87131c7a..25f487fe4c 100644 --- a/tests/test_asyncio/test_cluster.py +++ b/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 @@ -48,7 +49,7 @@ ) from ..ssl_utils import get_tls_certificates -from .compat import aclosing, mock +from .compat import aclosing pytestmark = pytest.mark.onlycluster diff --git a/tests/test_asyncio/test_connection.py b/tests/test_asyncio/test_connection.py index 38764d30cd..35d404a36e 100644 --- a/tests/test_asyncio/test_connection.py +++ b/tests/test_asyncio/test_connection.py @@ -1,6 +1,7 @@ import asyncio import socket import types +from unittest import mock from errno import ECONNREFUSED from unittest.mock import patch @@ -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 diff --git a/tests/test_asyncio/test_connection_pool.py b/tests/test_asyncio/test_connection_pool.py index d016483840..c30220fb1d 100644 --- a/tests/test_asyncio/test_connection_pool.py +++ b/tests/test_asyncio/test_connection_pool.py @@ -1,5 +1,6 @@ import asyncio import re +from unittest import mock import pytest import pytest_asyncio @@ -8,7 +9,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 .conftest import asynccontextmanager from .test_pubsub import wait_for_message diff --git a/tests/test_asyncio/test_pipeline.py b/tests/test_asyncio/test_pipeline.py index 19e11dc792..1f8c743b48 100644 --- a/tests/test_asyncio/test_pipeline.py +++ b/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 diff --git a/tests/test_asyncio/test_pubsub.py b/tests/test_asyncio/test_pubsub.py index d193cc9f2d..b281cb1281 100644 --- a/tests/test_asyncio/test_pubsub.py +++ b/tests/test_asyncio/test_pubsub.py @@ -12,6 +12,8 @@ else: from async_timeout import timeout as async_timeout +from unittest import mock + import pytest import pytest_asyncio import redis.asyncio as redis @@ -19,7 +21,7 @@ from redis.typing import EncodableT from tests.conftest import get_protocol_version, skip_if_server_version_lt -from .compat import aclosing, create_task, mock +from .compat import aclosing, create_task def with_timeout(t): diff --git a/tests/test_asyncio/test_sentinel_managed_connection.py b/tests/test_asyncio/test_sentinel_managed_connection.py index cae4b9581f..01f717ee38 100644 --- a/tests/test_asyncio/test_sentinel_managed_connection.py +++ b/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