Allowing for running tests on a port other than the fixed 6380 (redis…

…#2466) * Allowing for redis on a specified port * updating the readme --------- Co-authored-by: Vladimir Mihailenco <[email protected]> Co-authored-by: Monkey <[email protected]>
cpoole · Mar 6, 2023 · cbfe6cd · cbfe6cd
1 parent ad89a97
commit cbfe6cd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -167,6 +167,12 @@ Lastly, run:
 go test
 ```
 
+Another option is to run your specific tests with an already running redis. The example below, tests against a redis running on port 9999.:
+
+```shell
+REDIS_PORT=9999 go test <your options>
+```
+
 ## See also
 
 - [Golang ORM](https://bun.uptrace.dev) for PostgreSQL, MySQL, MSSQL, and SQLite

diff --git a/main_test.go b/main_test.go
@@ -17,8 +17,6 @@ import (
 )
 
 const (
-	redisPort          = "6380"
-	redisAddr          = ":" + redisPort
 	redisSecondaryPort = "6381"
 )
 
@@ -38,6 +36,9 @@ const (
 	sentinelPort3      = "9128"
 )
 
+var redisPort = "6380"
+var redisAddr = ":" + redisPort
+
 var (
 	sentinelAddrs = []string{":" + sentinelPort1, ":" + sentinelPort2, ":" + sentinelPort3}
 
@@ -64,6 +65,11 @@ func registerProcess(port string, p *redisProcess) {
 }
 
 var _ = BeforeSuite(func() {
+	addr := os.Getenv("REDIS_PORT")
+	if addr != "" {
+		redisPort = addr
+		redisAddr = ":" + redisPort
+	}
 	var err error
 
 	redisMain, err = startRedis(redisPort)

diff --git a/redis_test.go b/redis_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"net"
 	"testing"
 	"time"
@@ -64,7 +65,7 @@ var _ = Describe("Client", func() {
 	})
 
 	It("should Stringer", func() {
-		Expect(client.String()).To(Equal("Redis<:6380 db:15>"))
+		Expect(client.String()).To(Equal(fmt.Sprintf("Redis<:%s db:15>", redisPort)))
 	})
 
 	It("supports context", func() {