Fixes

Signed-off-by: Elena Kolevska <[email protected]>

Author: elena-kolevska

maintnotifications/e2e/fault_injector_test.go

@@ -525,17 +525,20 @@ func (c *FaultInjectorClient) request(ctx context.Context, method, path string,
 
 // GetClusterNodes returns a list of cluster node IDs
 func GetClusterNodes() []string {
+	// TODO Implement
 	// This would typically be configured via environment or discovery
 	return []string{"node-1", "node-2", "node-3", "node-4", "node-5", "node-6"}
 }
 
 // GetMasterNodes returns a list of master node IDs
 func GetMasterNodes() []string {
+	// TODO Implement
 	return []string{"node-1", "node-2", "node-3"}
 }
 
 // GetSlaveNodes returns a list of slave node IDs
 func GetSlaveNodes() []string {
+	// TODO Implement
 	return []string{"node-4", "node-5", "node-6"}
 }
 

maintnotifications/e2e/scenario_endpoint_types_test.go

@@ -59,7 +59,7 @@ func TestEndpointTypesPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("enterprise-cluster")
+	factory, err := CreateTestClientFactory("standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping endpoint types test: %v", err)
 	}

maintnotifications/e2e/scenario_push_notifications_test.go

@@ -59,7 +59,7 @@ func TestPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("enterprise-cluster")
+	factory, err := CreateTestClientFactory("standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping push notification tests: %v", err)
 	}
@@ -82,7 +82,7 @@ func TestPushNotifications(t *testing.T) {
 		MaxActiveConns: maxConnections,
 		MaintNotificationsConfig: &maintnotifications.Config{
 			Mode:                       maintnotifications.ModeEnabled,
-			HandoffTimeout:             30 * time.Second, // 30 seconds
+			HandoffTimeout:             40 * time.Second, // 30 seconds
 			RelaxedTimeout:             10 * time.Second, // 10 seconds relaxed timeout
 			PostHandoffRelaxedDuration: 2 * time.Second,  // 2 seconds post-handoff relaxed duration
 			MaxWorkers:                 20,
@@ -258,10 +258,16 @@ func TestPushNotifications(t *testing.T) {
 		MinIdleConns:   minIdleConns,
 		MaxActiveConns: maxConnections,
 		MaintNotificationsConfig: &maintnotifications.Config{
-			Mode:           maintnotifications.ModeEnabled,
-			RelaxedTimeout: 30 * time.Minute,
+			Mode:                       maintnotifications.ModeEnabled,
+			HandoffTimeout:             40 * time.Second, // 30 seconds
+			RelaxedTimeout:             30 * time.Minute, // 30 minutes relaxed timeout for second client
+			PostHandoffRelaxedDuration: 2 * time.Second,  // 2 seconds post-handoff relaxed duration
+			MaxWorkers:                 20,
+			EndpointType:               maintnotifications.EndpointTypeExternalIP, // Use external IP for enterprise
 		},
+		ClientName: "push-notification-test-client-2",
 	})
+
 	if err != nil {
 		t.Fatalf("failed to create client: %v", err)
 	}
@@ -282,7 +288,7 @@ func TestPushNotifications(t *testing.T) {
 			}
 		}()
 
-		p("Waiting for MOVING notification")
+		p("Waiting for MOVING notification on second client")
 		match, found = logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
 			return strings.Contains(s, logs2.ProcessingNotificationMessage) && notificationType(s, "MOVING")
 		}, 2*time.Minute)

maintnotifications/e2e/scenario_stress_test.go

@@ -49,7 +49,7 @@ func TestStressPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("enterprise-cluster")
+	factory, err := CreateTestClientFactory("standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping stress test: %v", err)
 	}

maintnotifications/e2e/scenario_timeout_configs_test.go

@@ -77,7 +77,7 @@ func TestTimeoutConfigurationsPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("enterprise-cluster")
+	factory, err := CreateTestClientFactory("standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping timeout configs test: %v", err)
 	}

maintnotifications/e2e/scenario_tls_configs_test.go

@@ -74,7 +74,7 @@ func TestTLSConfigurationsPushNotifications(t *testing.T) {
 	}()
 
 	// Create client factory from configuration
-	factory, err := CreateTestClientFactory("enterprise-cluster")
+	factory, err := CreateTestClientFactory("standalone")
 	if err != nil {
 		t.Skipf("Enterprise cluster not available, skipping TLS configs test: %v", err)
 	}

maintnotifications/e2e/utils_test.go

@@ -1,37 +1,5 @@
 package e2e
 
-import (
-	"context"
-	"sync"
-
-	"github.com/redis/go-redis/v9"
-)
-
-func pingOnAllIdleConns(client redis.UniversalClient) error {
-	idleConnsNum := client.PoolStats().IdleConns
-	wg := sync.WaitGroup{}
-	err := error(nil)
-	errCh := make(chan error, idleConnsNum)
-	if idleConnsNum == 0 {
-		idleConnsNum = 1
-	}
-	for i := uint32(0); i < idleConnsNum; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			errCh <- client.Ping(context.Background()).Err()
-		}()
-	}
-	wg.Wait()
-	close(errCh)
-	for err = range errCh {
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func isTimeout(errMsg string) bool {
 	return contains(errMsg, "i/o timeout") ||
 		contains(errMsg, "deadline exceeded") ||