Skip to content

Commit 68144d0

Browse files
committed
Removing unnecessary check
1 parent 0d0cfe6 commit 68144d0

File tree

8 files changed

+13
-15
lines changed

8 files changed

+13
-15
lines changed

tests/test_asyncio/compat.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
import asyncio
2-
from unittest import mock
3-
4-
try:
5-
mock.AsyncMock
6-
except AttributeError:
7-
from unittest import mock
82

93
try:
104
from contextlib import aclosing

tests/test_asyncio/conftest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import random
22
from contextlib import asynccontextmanager as _asynccontextmanager
33
from typing import Union
4+
from unittest import mock
45

56
import pytest
67
import pytest_asyncio
@@ -14,8 +15,6 @@
1415
from redis.credentials import CredentialProvider
1516
from tests.conftest import REDIS_INFO, get_credential_provider
1617

17-
from .compat import mock
18-
1918

2019
async def _get_info(redis_url):
2120
client = redis.Redis.from_url(redis_url)

tests/test_asyncio/test_cluster.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import ssl
55
import warnings
66
from typing import Any, Awaitable, Callable, Dict, List, Optional, Type, Union
7+
from unittest import mock
78
from urllib.parse import urlparse
89

910
import pytest
@@ -48,7 +49,7 @@
4849
)
4950

5051
from ..ssl_utils import get_tls_certificates
51-
from .compat import aclosing, mock
52+
from .compat import aclosing
5253

5354
pytestmark = pytest.mark.onlycluster
5455

tests/test_asyncio/test_connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import asyncio
22
import socket
33
import types
4+
from unittest import mock
45
from errno import ECONNREFUSED
56
from unittest.mock import patch
67

@@ -25,7 +26,6 @@
2526
from redis.utils import HIREDIS_AVAILABLE
2627
from tests.conftest import skip_if_server_version_lt
2728

28-
from .compat import mock
2929
from .mocks import MockStream
3030

3131

tests/test_asyncio/test_connection_pool.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import asyncio
22
import re
3+
from unittest import mock
34

45
import pytest
56
import pytest_asyncio
@@ -8,7 +9,7 @@
89
from redis.auth.token import TokenInterface
910
from tests.conftest import skip_if_redis_enterprise, skip_if_server_version_lt
1011

11-
from .compat import aclosing, mock
12+
from .compat import aclosing
1213
from .conftest import asynccontextmanager
1314
from .test_pubsub import wait_for_message
1415

tests/test_asyncio/test_pipeline.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
from unittest import mock
2+
13
import pytest
24
import redis
35
from tests.conftest import skip_if_server_version_lt
46

5-
from .compat import aclosing, mock
7+
from .compat import aclosing
68
from .conftest import wait_for_command
79

810

tests/test_asyncio/test_pubsub.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
else:
1313
from async_timeout import timeout as async_timeout
1414

15+
from unittest import mock
16+
1517
import pytest
1618
import pytest_asyncio
1719
import redis.asyncio as redis
1820
from redis.exceptions import ConnectionError
1921
from redis.typing import EncodableT
2022
from tests.conftest import get_protocol_version, skip_if_server_version_lt
2123

22-
from .compat import aclosing, create_task, mock
24+
from .compat import aclosing, create_task
2325

2426

2527
def with_timeout(t):

tests/test_asyncio/test_sentinel_managed_connection.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import socket
2+
from unittest import mock
23

34
import pytest
45
from redis.asyncio.retry import Retry
56
from redis.asyncio.sentinel import SentinelManagedConnection
67
from redis.backoff import NoBackoff
78

8-
from .compat import mock
9-
109
pytestmark = pytest.mark.asyncio
1110

1211

0 commit comments

Comments
 (0)