stop tests with build redis from source

Author: ndyakov

.github/workflows/build.yml

@@ -10,31 +10,6 @@ permissions:
   contents: read
 
 jobs:
-  build:
-    name: build
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        go-version: [1.22.x, 1.23.x]
-
-    steps:
-      - name: Set up ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ matrix.go-version }}
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Test
-        run: make test
-
-      - name: Upload to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          files: coverage.txt
-          token: ${{ secrets.CODECOV_TOKEN }}
 
   benchmark:
     name: benchmark
@@ -71,7 +46,6 @@ jobs:
             ["8.0-M03"]="8.0-M04-pre"
             ["7.4.2"]="rs-7.4.0-v2"
           )
-          
           if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
             echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
             echo "REDIS_IMAGE=redis:${{ matrix.redis-version }}" >> $GITHUB_ENV
@@ -113,4 +87,10 @@ jobs:
         with:
           go-version: ${{matrix.go-version}}
           redis-version: ${{ matrix.redis-version }}
-      
+
+      - name: Upload to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          files: coverage.txt
+          token: ${{ secrets.CODECOV_TOKEN }}
+

main_test.go

@@ -51,8 +51,7 @@ var (
 
 	processes map[string]*redisProcess
 
-	redisMain                                      *redisProcess
-	ringShard1, ringShard2, ringShard3             *redisProcess
+	ringShard1, ringShard2, ringShard3             *redis.Client
 	sentinelMaster, sentinelSlave1, sentinelSlave2 *redisProcess
 	sentinel1, sentinel2, sentinel3                *redisProcess
 )
@@ -119,19 +118,6 @@ var _ = BeforeSuite(func() {
 	}
 
 	if !RECluster && !RCEDocker {
-
-		redisMain, err = startRedis(redisPort)
-		Expect(err).NotTo(HaveOccurred())
-
-		ringShard1, err = startRedis(ringShard1Port)
-		Expect(err).NotTo(HaveOccurred())
-
-		ringShard2, err = startRedis(ringShard2Port)
-		Expect(err).NotTo(HaveOccurred())
-
-		ringShard3, err = startRedis(ringShard3Port)
-		Expect(err).NotTo(HaveOccurred())
-
 		sentinelMaster, err = startRedis(sentinelMasterPort)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -159,6 +145,15 @@ var _ = BeforeSuite(func() {
 		redisAddr = redisStackAddr
 
 		if !RECluster {
+			ringShard1, err = connectTo(ringShard1Port)
+			Expect(err).NotTo(HaveOccurred())
+
+			ringShard2, err = connectTo(ringShard2Port)
+			Expect(err).NotTo(HaveOccurred())
+
+			ringShard3, err = connectTo(ringShard3Port)
+			Expect(err).NotTo(HaveOccurred())
+
 			// populate cluster node information
 			Expect(configureClusterTopology(ctx, cluster)).NotTo(HaveOccurred())
 		}

ring_test.go

@@ -130,34 +130,6 @@ var _ = Describe("Redis Ring", func() {
 		Expect(ringShard2.Info(ctx, "keyspace").Val()).To(ContainSubstring("keys=44"))
 	})
 
-	It("uses single shard when one of the shards is down", func() {
-		// Stop ringShard2.
-		Expect(ringShard2.Close()).NotTo(HaveOccurred())
-
-		Eventually(func() int {
-			return ring.Len()
-		}, "30s").Should(Equal(1))
-
-		setRingKeys()
-
-		// RingShard1 should have all keys.
-		Expect(ringShard1.Info(ctx, "keyspace").Val()).To(ContainSubstring("keys=100"))
-
-		// Start ringShard2.
-		var err error
-		ringShard2, err = startRedis(ringShard2Port)
-		Expect(err).NotTo(HaveOccurred())
-
-		Eventually(func() int {
-			return ring.Len()
-		}, "30s").Should(Equal(2))
-
-		setRingKeys()
-
-		// RingShard2 should have its keys.
-		Expect(ringShard2.Info(ctx, "keyspace").Val()).To(ContainSubstring("keys=44"))
-	})
-
 	It("supports hash tags", func() {
 		for i := 0; i < 100; i++ {
 			err := ring.Set(ctx, fmt.Sprintf("key%d{tag}", i), "value", 0).Err()