wip

Author: ndyakov

.github/workflows/doctests.yaml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.22", "1.23"]
+        go-version: ["1.23"]
 
     steps:
       - name: Set up ${{ matrix.go-version }}

.gitignore

@@ -5,3 +5,5 @@ testdata/*
 *.tar.gz
 *.dic
 redis8tests.sh
+coverage.txt
+**/coverage.txt

Makefile

@@ -1,5 +1,4 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-export REDIS_VERSION := "7.4"
 
 docker.start:
 	docker compose --profile all up -d
@@ -17,8 +16,8 @@ test.ci:
 	  echo "go test in $${dir}"; \
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \
-	    go test -coverprofile=coverage.txt -covermode=atomic ./... -race && \
-	    go vet); \
+	    go vet && \
+	    go test -coverprofile=coverage.txt -covermode=atomic ./... -race); \
 	done
 	cd internal/customvet && go build .
 	go vet -vettool ./internal/customvet/customvet

coverage.txt

@@ -50,7 +50,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 	})
 
 	It("should TFunctionLoad, TFunctionLoadArgs and TFunctionDelete ", Label("gears", "tfunctionload"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())
 		Expect(resultAdd).To(BeEquivalentTo("OK"))
@@ -60,7 +60,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 		Expect(resultAdd).To(BeEquivalentTo("OK"))
 	})
 	It("should TFunctionList", Label("gears", "tfunctionlist"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())
 		Expect(resultAdd).To(BeEquivalentTo("OK"))
@@ -74,7 +74,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 	})
 
 	It("should TFCall", Label("gears", "tfcall"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		var resultAdd interface{}
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -85,7 +85,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 	})
 
 	It("should TFCallArgs", Label("gears", "tfcallargs"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		var resultAdd interface{}
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -97,7 +97,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 	})
 
 	It("should TFCallASYNC", Label("gears", "TFCallASYNC"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		var resultAdd interface{}
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -108,7 +108,7 @@ var _ = Describe("RedisGears commands", Label("gears"), func() {
 	})
 
 	It("should TFCallASYNCArgs", Label("gears", "TFCallASYNCargs"), func() {
-		SkipAfterRedisVersion(7.2, "gears are not working in later versions")
+		SkipAfterRedisVersion(7.4, "gears are not working in later versions")
 		var resultAdd interface{}
 		resultAdd, err := client.TFunctionLoad(ctx, libCode("lib1")).Result()
 		Expect(err).NotTo(HaveOccurred())

gears_commands_test.go

@@ -93,7 +93,7 @@ var _ = BeforeSuite(func() {
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
 	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
 
-	RedisVersion, _ = strconv.ParseFloat(os.Getenv("REDIS_VERSION"), 64)
+	RedisVersion, _ = strconv.ParseFloat(strings.Trim(os.Getenv("REDIS_VERSION"), "\""), 64)
 
 	if RedisVersion == 0 {
 		RedisVersion = 7.2

main_test.go

@@ -379,7 +379,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 	// up until redis 8 the default scorer was TFIDF, in redis 8 it is BM25
 	// this test expect redis major version >= 8
 	It("should FTSearch WithScores", Label("search", "ftsearch"), func() {
-		SkipBeforeRedisVersion(8, "default scorer is not BM25")
+		SkipBeforeRedisVersion(7.9, "default scorer is not BM25")
 
 		text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result()
@@ -420,9 +420,9 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 	})
 
 	// up until redis 8 the default scorer was TFIDF, in redis 8 it is BM25
-	// this test expect redis major version <=7
+	// this test expect redis version < 8.0
 	It("should FTSearch WithScores", Label("search", "ftsearch"), func() {
-		SkipAfterRedisVersion(7, "default scorer is not TFIDF")
+		SkipAfterRedisVersion(7.9, "default scorer is not TFIDF")
 		text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -646,7 +646,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
 	})
 
 	It("should FTAggregate with scorer and addscores", Label("search", "ftaggregate", "NonRedisEnterprise"), func() {
-		SkipBeforeRedisVersion(8, "ADDSCORES is available in Redis CE 8")
+		SkipBeforeRedisVersion(7.9, "ADDSCORES is available in Redis CE 8")
 		title := &redis.FieldSchema{FieldName: "title", FieldType: redis.SearchFieldTypeText, Sortable: false}
 		description := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText, Sortable: false}
 		val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{OnHash: true, Prefix: []interface{}{"product:"}}, title, description).Result()