Add redis major version env

Enable filtering test per redis major version
Fix test for FT.SEARCH WITHSCORE, the default scorer
has changed.

fix Makefile syntax

remove filter from github action

fix makefile

use the container name in Makefile

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -36,6 +36,7 @@ runs:
         )
         
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
+          echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
           echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
           echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
         else
@@ -52,12 +53,10 @@ runs:
         RCE_DOCKER: "true"
         RE_CLUSTER: "false"
       run: |
-        set -e
-        redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
         go test \
         --ginkgo.skip-file="ring_test.go" \
         --ginkgo.skip-file="sentinel_test.go" \
         --ginkgo.skip-file="pubsub_test.go" \
         --ginkgo.skip-file="gears_commands_test.go" \
-        --ginkgo.label-filter="!NonRedisEnterprise && RedisVersion: isSubsetOf {$redis_major_version}"
+        --ginkgo.label-filter="!NonRedisEnterprise"
       shell: bash

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

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

Makefile

@@ -1,9 +1,8 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-REDIS_VERSION="7.4.2"
+export REDIS_MAJOR_VERSION := 7
 
 test: testdeps
 	$(eval R_MAJOR := $(shell echo "$(REDIS_VERSION)" | grep -o '\d' | head -1))
-	echo "Executing test agains redis-stack-server:latest and redis $(REDIS_VERSION), $(R_MAJOR) "
 	docker start go-redis-redis-stack || docker run -d --name go-redis-redis-stack  -p 6379:6379 -e REDIS_ARGS="--enable-debug-command yes --enable-module-command yes" redis/redis-stack-server:latest
 	$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
 	set -e; for dir in $(GO_MOD_DIRS); do \
@@ -14,7 +13,7 @@ test: testdeps
 	  echo "go test in $${dir}"; \
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \
-	    go test --ginkgo.label-filter="RedisVersion: isSubsetOf \"$(R_MAJOR)\""&& \
+	    go test && \
 	    go test ./... -short -race && \
 	    go test ./... -run=NONE -bench=. -benchmem && \
 	    env GOOS=linux GOARCH=386 go test && \
@@ -23,11 +22,13 @@ test: testdeps
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet
-	docker stop (docker container ls -a -q --filter name=go-redis-redis-stack)
-
-testdeps: testdata/redis/src/redis-server
+	docker stop go-redis-redis-stack
 
+dockertest:
+	docker start go-redis-redis-stack || docker run -d --name go-redis-redis-stack  -p 6379:6379 -e REDIS_ARGS="--enable-debug-command yes --enable-module-command yes" redis/redis-stack-server:latest
+	docker stop go-redis-redis-stack
 
+testdeps: testdata/redis/src/redis-server
 
 bench: testdeps
 	go test ./... -test.run=NONE -test.bench=. -test.benchmem

main_test.go

@@ -70,6 +70,11 @@ var RECluster = false
 // Redis Community Edition Docker
 var RCEDocker = false
 
+// Notes the major version of redis we are executing tests.
+// This can be used before we change the bsm fork of ginkgo for one,
+// which have support for label sets, so we can filter tests per redis major version.
+var REDIS_MAJOR_VERSION = 7
+
 func registerProcess(port string, p *redisProcess) {
 	if processes == nil {
 		processes = make(map[string]*redisProcess)
@@ -86,7 +91,13 @@ var _ = BeforeSuite(func() {
 	var err error
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
 	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
+
+	REDIS_MAJOR_VERSION, _ = strconv.Atoi(os.Getenv("REDIS_MAJOR_VERSION"))
+	Expect(REDIS_MAJOR_VERSION).To(BeNumerically(">=", 6))
+	Expect(REDIS_MAJOR_VERSION).To(BeNumerically("<=", 8))
+
 	fmt.Printf("RECluster: %v\n", RECluster)
+	fmt.Printf("REDIS_MAJOR_VERSION: %v\n", REDIS_MAJOR_VERSION)
 	fmt.Printf("RCEDocker: %v\n", RCEDocker)
 	if !RECluster && !RCEDocker {
 

search_test.go

@@ -372,7 +372,10 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 	})
 
 	// in redis 8, the default scorer is changed BM25
-	It("should FTSearch WithScores", Label("search", "ftsearch", "RedisVersion:v8"), func() {
+	It("should FTSearch WithScores", Label("search", "ftsearch"), func() {
+		if REDIS_MAJOR_VERSION < 8 {
+			Skip("default scorer is not BM25")
+		}
 		text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -384,7 +387,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 
 		res, err := client.FTSearchWithArgs(ctx, "idx1", "quick", &redis.FTSearchOptions{WithScores: true}).Result()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(*res.Docs[0].Score).To(BeNumerically("<=", 0.22471909420069797))
+		Expect(*res.Docs[0].Score).To(BeNumerically("<=", 0.236))
 
 		res, err = client.FTSearchWithArgs(ctx, "idx1", "quick", &redis.FTSearchOptions{WithScores: true, Scorer: "TFIDF"}).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -411,7 +414,10 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 		Expect(*res.Docs[0].Score).To(BeEquivalentTo(float64(0)))
 	})
 
-	It("should FTSearch WithScores", Label("search", "ftsearch", "RedisVersion:v7"), func() {
+	It("should FTSearch WithScores", Label("search", "ftsearch"), func() {
+		if REDIS_MAJOR_VERSION >= 8 {
+			Skip("default scorer is BM25")
+		}
 		text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result()
 		Expect(err).NotTo(HaveOccurred())