Fixing errors after rebase.

Author: petyaslavova

tests/test_scenario/test_hitless_upgrade.py

@@ -14,7 +14,7 @@
 from redis.connection import ConnectionInterface
 from redis.maintenance_events import (
     EndpointType,
-    MaintenanceEventsConfig,
+    MaintNotificationsConfig,
     MaintenanceState,
 )
 from tests.test_scenario.conftest import (
@@ -255,7 +255,7 @@ def _validate_moving_state(
                     and conn.host != conn.orig_host_address
                     and (
                         configured_endpoint_type
-                        == MaintenanceEventsConfig().get_endpoint_type(conn.host, conn)
+                        == MaintNotificationsConfig().get_endpoint_type(conn.host, conn)
                     )
                 )
             )
@@ -330,7 +330,7 @@ def _validate_default_notif_disabled_state(
     @pytest.mark.timeout(300)  # 5 minutes timeout for this test
     def test_receive_failing_over_and_failed_over_push_notification(
         self,
-        client_maint_events: Redis,
+        client_maint_notifications: Redis,
         fault_injector_client: FaultInjectorClient,
         endpoints_config: Dict[str, Any],
     ):
@@ -339,7 +339,7 @@ def test_receive_failing_over_and_failed_over_push_notification(
 
         """
         logging.info("Creating one connection in the pool.")
-        conn = client_maint_events.connection_pool.get_connection()
+        conn = client_maint_notifications.connection_pool.get_connection()
 
         logging.info("Executing failover command...")
         failover_thread = Thread(
@@ -351,24 +351,24 @@ def test_receive_failing_over_and_failed_over_push_notification(
 
         logging.info("Waiting for FAILING_OVER push notifications...")
         ClientValidations.wait_push_notification(
-            client_maint_events, timeout=FAILOVER_TIMEOUT, connection=conn
+            client_maint_notifications, timeout=FAILOVER_TIMEOUT, connection=conn
         )
 
         logging.info("Validating connection maintenance state...")
         assert conn.maintenance_state == MaintenanceState.MAINTENANCE
-        assert conn._sock.gettimeout() == RELAX_TIMEOUT
+        assert conn._sock.gettimeout() == RELAXED_TIMEOUT
 
         logging.info("Waiting for FAILED_OVER push notifications...")
         ClientValidations.wait_push_notification(
-            client_maint_events, timeout=FAILOVER_TIMEOUT, connection=conn
+            client_maint_notifications, timeout=FAILOVER_TIMEOUT, connection=conn
         )
 
         logging.info("Validating connection default states is restored...")
         assert conn.maintenance_state == MaintenanceState.NONE
         assert conn._sock.gettimeout() == CLIENT_TIMEOUT
 
         logging.info("Releasing connection back to the pool...")
-        client_maint_events.connection_pool.release(conn)
+        client_maint_notifications.connection_pool.release(conn)
 
         failover_thread.join()
 
@@ -675,7 +675,7 @@ def test_old_connection_shutdown_during_moving(
         # and connected to the new address
         endpoint_type = EndpointType.EXTERNAL_IP
         logging.info("Testing old connection shutdown during MOVING")
-        client = _get_client_maint_events(
+        client = _get_client_maint_notifications(
             endpoints_config=endpoints_config, endpoint_type=endpoint_type
         )
 
@@ -753,12 +753,12 @@ def execute_commands(moving_event: threading.Event, errors: Queue):
             if conn._sock is not None:
                 assert conn.get_resolved_ip() == conn.host
                 assert conn.maintenance_state == MaintenanceState.MOVING
-                assert conn._sock.gettimeout() == RELAX_TIMEOUT
+                assert conn._sock.gettimeout() == RELAXED_TIMEOUT
                 assert conn.host != conn.orig_host_address
                 assert not conn.should_reconnect()
             else:
                 assert conn.maintenance_state == MaintenanceState.MOVING
-                assert conn.socket_timeout == RELAX_TIMEOUT
+                assert conn.socket_timeout == RELAXED_TIMEOUT
                 assert conn.host != conn.orig_host_address
                 assert not conn.should_reconnect()
 
@@ -831,7 +831,7 @@ def test_new_connections_receive_moving(
 
         endpoint_type = EndpointType.EXTERNAL_IP
         # create new client with new pool that should also receive the moving event
-        new_client = _get_client_maint_events(
+        new_client = _get_client_maint_notifications(
             endpoints_config=endpoints_config,
             endpoint_type=endpoint_type,
             host_config=old_address,