e2e fix

Author: ndyakov

maintnotifications/e2e/main_test.go

@@ -26,11 +26,21 @@ func TestMain(m *testing.M) {
 		return
 	}
 
-	faultInjector, faultInjectorCleanup, err = CreateTestFaultInjectorWithCleanup()
-	if err != nil {
-		panic("Failed to create fault injector: " + err.Error())
+	// Only create fault injector if we're not using the unified injector
+	// The unified injector tests use NewNotificationInjector() which auto-detects the mode
+	// and doesn't require the global faultInjector variable
+	// We can detect unified injector mode by checking if REDIS_ENDPOINTS_CONFIG_PATH is NOT set
+	// (which means we're using the proxy mock mode)
+	if os.Getenv("REDIS_ENDPOINTS_CONFIG_PATH") != "" {
+		// Real fault injector mode - create the global fault injector
+		faultInjector, faultInjectorCleanup, err = CreateTestFaultInjectorWithCleanup()
+		if err != nil {
+			panic("Failed to create fault injector: " + err.Error())
+		}
+		defer faultInjectorCleanup()
+	} else {
+		log.Println("Using proxy mock mode - skipping global fault injector setup")
 	}
-	defer faultInjectorCleanup()
 
 	// use log collector to capture logs from redis clients
 	logCollector = NewTestLogCollector()

maintnotifications/e2e/scenario_unified_injector_test.go

@@ -3,6 +3,7 @@ package e2e
 import (
 	"context"
 	"fmt"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -243,10 +244,13 @@ func TestUnifiedInjector_SMIGRATED(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	// Count how many nodes the client knows about
+	var nodeAddrsMu sync.Mutex
 	nodeAddrs := make(map[string]bool)
 	client.ForEachShard(ctx, func(ctx context.Context, nodeClient *redis.Client) error {
 		addr := nodeClient.Options().Addr
+		nodeAddrsMu.Lock()
 		nodeAddrs[addr] = true
+		nodeAddrsMu.Unlock()
 		t.Logf("Client knows about node: %s", addr)
 		return nil
 	})