Fixed tests

Author: vladvildanov

redis/asyncio/cluster.py

@@ -46,10 +46,7 @@
 from redis.commands import READ_COMMANDS, AsyncRedisClusterCommands
 from redis.crc import REDIS_CLUSTER_HASH_SLOTS, key_slot
 from redis.credentials import CredentialProvider
-from redis.event import (
-    AfterAsyncClusterInstantiationEvent,
-    EventDispatcher,
-)
+from redis.event import AfterAsyncClusterInstantiationEvent, EventDispatcher
 from redis.exceptions import (
     AskError,
     BusyLoadingError,

redis/asyncio/connection.py

@@ -41,10 +41,7 @@
 from redis.asyncio.retry import Retry
 from redis.backoff import NoBackoff
 from redis.connection import DEFAULT_RESP_VERSION
-from redis.credentials import (
-    CredentialProvider,
-    UsernamePasswordCredentialProvider,
-)
+from redis.credentials import CredentialProvider, UsernamePasswordCredentialProvider
 from redis.exceptions import (
     AuthenticationError,
     AuthenticationWrongNumberOfArgsError,

redis/connection.py

@@ -24,14 +24,8 @@
 from ._parsers import Encoder, _HiredisParser, _RESP2Parser, _RESP3Parser
 from .auth.token import TokenInterface
 from .backoff import NoBackoff
-from .credentials import (
-    CredentialProvider,
-    UsernamePasswordCredentialProvider,
-)
-from .event import (
-    AfterConnectionReleasedEvent,
-    EventDispatcher,
-)
+from .credentials import CredentialProvider, UsernamePasswordCredentialProvider
+from .event import AfterConnectionReleasedEvent, EventDispatcher
 from .exceptions import (
     AuthenticationError,
     AuthenticationWrongNumberOfArgsError,

tests/test_connection.py

@@ -8,6 +8,8 @@
 from unittest.mock import call, patch
 
 import pytest
+from redis.credentials import UsernamePasswordCredentialProvider
+
 import redis
 from redis import ConnectionPool, Redis
 from redis._parsers import _HiredisParser, _RESP2Parser, _RESP3Parser
@@ -441,6 +443,7 @@ def test_clears_cache_on_disconnect(self, mock_connection, cache_conf):
         mock_connection.retry = "mock"
         mock_connection.host = "mock"
         mock_connection.port = "mock"
+        mock_connection.credential_provider = UsernamePasswordCredentialProvider()
 
         proxy_connection = CacheProxyConnection(
             mock_connection, cache, threading.Lock()
@@ -457,6 +460,7 @@ def test_read_response_returns_cached_reply(self, mock_cache, mock_connection):
         mock_connection.retry = "mock"
         mock_connection.host = "mock"
         mock_connection.port = "mock"
+        mock_connection.credential_provider = UsernamePasswordCredentialProvider()
 
         mock_cache.is_cachable.return_value = True
         mock_cache.get.side_effect = [
@@ -541,6 +545,7 @@ def test_triggers_invalidation_processing_on_another_connection(
         mock_connection.retry = "mock"
         mock_connection.host = "mock"
         mock_connection.port = "mock"
+        mock_connection.credential_provider = UsernamePasswordCredentialProvider()
 
         another_conn = copy.deepcopy(mock_connection)
         another_conn.can_read.side_effect = [True, False]

tests/test_credentials.py

@@ -8,7 +8,7 @@
 import pytest
 import redis
 from mock.mock import Mock, call
-from redis import AuthenticationError, DataError, Redis, ResponseError, asyncio
+from redis import AuthenticationError, DataError, Redis, ResponseError
 from redis.auth.err import RequestTokenErr
 from redis.backoff import NoBackoff
 from redis.connection import ConnectionInterface, ConnectionPool