fix ports in monitor test

Author: ndyakov

.github/workflows/test-redis-enterprise.yml

@@ -47,7 +47,6 @@ jobs:
       - name: Test
         env:
           RE_CLUSTER: true
-          USE_CONTAINERIZED_REDIS: true
         run: |
           go test \
           --ginkgo.skip-file="ring_test.go" \

main_test.go

@@ -128,15 +128,17 @@ var _ = BeforeSuite(func() {
 		redisPort = redisStackPort
 		redisAddr = redisStackAddr
 
-		// populate cluster node information
-		Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
+		if !RECluster {
+			// populate cluster node information
+			Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
+		}
 	}
 })
 
 var _ = AfterSuite(func() {
-	// This should result in no errors when there were no processes started from the tests
 	Expect(cluster.Close()).NotTo(HaveOccurred())
 
+	// NOOP if there are no processes registered
 	for _, p := range processes {
 		Expect(p.Close()).NotTo(HaveOccurred())
 	}

monitor_test.go

@@ -22,7 +22,7 @@ var _ = Describe("Monitor command", Label("monitor"), func() {
 		if os.Getenv("RUN_MONITOR_TEST") != "true" {
 			Skip("Skipping Monitor command test. Set RUN_MONITOR_TEST=true to run it.")
 		}
-		client = redis.NewClient(&redis.Options{Addr: ":6379"})
+		client = redis.NewClient(&redis.Options{Addr: redisPort})
 		Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
 
 	})
@@ -61,7 +61,7 @@ func TestMonitorCommand(t *testing.T) {
 	}
 
 	ctx := context.TODO()
-	client := redis.NewClient(&redis.Options{Addr: ":6379"})
+	client := redis.NewClient(&redis.Options{Addr: redisPort})
 	if err := client.FlushDB(ctx).Err(); err != nil {
 		t.Fatalf("FlushDB failed: %v", err)
 	}
@@ -72,8 +72,8 @@ func TestMonitorCommand(t *testing.T) {
 		}
 	}()
 
-	ress := make(chan string, 10)                             // Buffer to prevent blocking
-	client1 := redis.NewClient(&redis.Options{Addr: ":6379"}) // Adjust the Addr field as necessary
+	ress := make(chan string, 10)                               // Buffer to prevent blocking
+	client1 := redis.NewClient(&redis.Options{Addr: redisPort}) // Adjust the Addr field as necessary
 	mn := client1.Monitor(ctx, ress)
 	mn.Start()
 	// Wait for the Redis server to be in monitoring mode.

osscluster_test.go

@@ -93,6 +93,7 @@ func (s *clusterScenario) Close() error {
 		if err != nil {
 			return err
 		}
+
 		// since 7.2 forget calls should be propagated, calling only master
 		// nodes should be sufficient.
 		for _, nID := range s.nodeIDs {