Skip to content

Commit fd39178

Browse files
committed
Removing unnecessary check
1 parent 00f5be4 commit fd39178

9 files changed

+14
-15
lines changed

CHANGES

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* No longer necessary check remove from tests
12
* Move doctests (doc code examples) to main branch
23
* Update `ResponseT` type hint
34
* Allow to control the minimum SSL version

tests/test_asyncio/compat.py

-6
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

+1-2
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
@@ -13,8 +14,6 @@
1314
from redis.backoff import NoBackoff
1415
from tests.conftest import REDIS_INFO
1516

16-
from .compat import mock
17-
1817

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

tests/test_asyncio/test_cluster.py

+2-1
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
@@ -39,7 +40,7 @@
3940
)
4041

4142
from ..ssl_utils import get_ssl_filename
42-
from .compat import aclosing, mock
43+
from .compat import aclosing
4344

4445
pytestmark = pytest.mark.onlycluster
4546

tests/test_asyncio/test_connection.py

+1-1
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 unittest.mock import patch
56

67
import pytest
@@ -24,7 +25,6 @@
2425
from redis.utils import HIREDIS_AVAILABLE
2526
from tests.conftest import skip_if_server_version_lt
2627

27-
from .compat import mock
2828
from .mocks import MockStream
2929

3030

tests/test_asyncio/test_connection_pool.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import asyncio
22
import re
3+
from unittest import mock
34

45
import pytest
56
import pytest_asyncio
67
import redis.asyncio as redis
78
from redis.asyncio.connection import Connection, to_bool
89
from tests.conftest import skip_if_redis_enterprise, skip_if_server_version_lt
910

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

tests/test_asyncio/test_pipeline.py

+3-1
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

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
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
@@ -20,7 +22,7 @@
2022
from redis.utils import HIREDIS_AVAILABLE
2123
from tests.conftest import get_protocol_version, skip_if_server_version_lt
2224

23-
from .compat import aclosing, create_task, mock
25+
from .compat import aclosing, create_task
2426

2527

2628
def with_timeout(t):

tests/test_asyncio/test_sentinel_managed_connection.py

+1-2
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)