flush cluster topology after test completion

Author: ndyakov

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     environment:
       - NODES=6
       - PORT=16600
-    command: ${REDIS_EXTRA_ARGS:--cluster-enabled yes ""}
+    command: "--cluster-enabled yes"
     ports:
       - "16600-16605:16600-16605"
     volumes:

osscluster_test.go

@@ -87,6 +87,19 @@ func (s *clusterScenario) newClusterClient(
 }
 
 func (s *clusterScenario) Close() error {
+
+	for _, master := range s.masters() {
+		err := master.FlushAll(ctx).Err()
+		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 {
+			master.ClusterForget(ctx, nID)
+		}
+	}
+
 	for _, port := range s.ports {
 		if process, ok := processes[port]; ok {
 			process.Close()
@@ -1147,7 +1160,7 @@ var _ = Describe("ClusterClient", func() {
 			client, err := client.SlaveForKey(ctx, "test")
 			Expect(err).ToNot(HaveOccurred())
 			info := client.Info(ctx, "server")
-			Expect(info.Val()).Should(ContainSubstring("tcp_port:16602"))
+			Expect(info.Val()).Should(ContainSubstring("tcp_port:16604"))
 		})
 
 		It("should return correct master for key", func() {