Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redis/_parsers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from asyncio import IncompleteReadError, StreamReader, TimeoutError
from typing import Awaitable, Callable, List, Optional, Protocol, Union

from redis.maintenance_events import (
from redis.maint_notifications import (
MaintenanceNotification,
NodeFailedOverNotification,
NodeFailingOverNotification,
Expand Down
2 changes: 1 addition & 1 deletion redis/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
WatchError,
)
from redis.lock import Lock
from redis.maintenance_events import (
from redis.maint_notifications import (
MaintNotificationsConfig,
MaintNotificationsPoolHandler,
)
Expand Down
2 changes: 1 addition & 1 deletion redis/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
ResponseError,
TimeoutError,
)
from .maintenance_events import (
from .maint_notifications import (
MaintenanceState,
MaintNotificationsConfig,
MaintNotificationsConnectionHandler,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from redis.connection import ConnectionInterface

from redis.maintenance_events import (
from redis.maint_notifications import (
MaintenanceNotification,
NodeMovingNotification,
NodeMigratingNotification,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
BlockingConnectionPool,
MaintenanceState,
)
from redis.maintenance_events import (
from redis.maint_notifications import (
MaintNotificationsConfig,
NodeMigratingNotification,
NodeMigratedNotification,
Expand Down Expand Up @@ -668,7 +668,7 @@ def test_pool_handler_with_migrating_notification(self):
patch.object(
pool_handler, "handle_node_moving_notification"
) as mock_handle_moving,
patch("redis.maintenance_events.logging.error") as mock_logging_error,
patch("redis.maint_notifications.logging.error") as mock_logging_error,
):
# Pool handler should return None for migrating notifications (not its responsibility)
pool_handler.handle_notification(migrating_notification)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_scenario/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from redis.backoff import ExponentialWithJitterBackoff, NoBackoff
from redis.client import Redis
from redis.maintenance_events import EndpointType, MaintNotificationsConfig
from redis.maint_notifications import EndpointType, MaintNotificationsConfig
from redis.retry import Retry
from tests.test_scenario.fault_injector_client import FaultInjectorClient

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from redis import Redis
from redis.connection import ConnectionInterface
from redis.maintenance_events import (
from redis.maint_notifications import (
EndpointType,
MaintNotificationsConfig,
MaintenanceState,
Expand All @@ -25,14 +25,15 @@
from tests.test_scenario.fault_injector_client import (
FaultInjectorClient,
)
from tests.test_scenario.hitless_upgrade_helpers import (
from tests.test_scenario.maint_notifications_helpers import (
ClientValidations,
ClusterOperations,
)

logging.basicConfig(
level=logging.INFO,
format="%(asctime)s %(levelname)s %(message)s",
datefmt="%Y-%m-%d %H:%M:%S:%f",
)

BIND_TIMEOUT = 30
Expand Down