Merge pull request #2371 from redis/feature/fewer-deps

vmihailenco · web-flow · commit 0bc68f531d57 · 2023-01-30T08:57:03.000+02:00
Reduce (chain) of test dependencies
diff --git a/cluster_test.go b/cluster_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/redis/go-redis/v9"
diff --git a/command_test.go b/command_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/redis/go-redis/v9"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 var _ = Describe("Cmd", func() {
diff --git a/commands_test.go b/commands_test.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 	"github.com/redis/go-redis/v9/internal/proto"
diff --git a/example/del-keys-without-ttl/go.sum b/example/del-keys-without-ttl/go.sum
diff --git a/example/hll/go.sum b/example/hll/go.sum
diff --git a/example/lua-scripting/go.sum b/example/lua-scripting/go.sum
diff --git a/example/otel/go.sum b/example/otel/go.sum
diff --git a/example/redis-bloom/go.sum b/example/redis-bloom/go.sum
diff --git a/example/scan-struct/go.sum b/example/scan-struct/go.sum
diff --git a/extra/rediscensus/go.sum b/extra/rediscensus/go.sum
diff --git a/extra/rediscmd/go.mod b/extra/rediscmd/go.mod
@@ -5,7 +5,7 @@ go 1.15
 replace github.com/redis/go-redis/v9 => ../..
 
 require (
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.25.0
+	github.com/bsm/ginkgo/v2 v2.5.0
+	github.com/bsm/gomega v1.20.0
 	github.com/redis/go-redis/v9 v9.0.0-rc.4
 )
diff --git a/extra/rediscmd/go.sum b/extra/rediscmd/go.sum
diff --git a/extra/rediscmd/rediscmd_test.go b/extra/rediscmd/rediscmd_test.go
@@ -3,9 +3,9 @@ package rediscmd
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/ginkgo/v2/extensions/table"
+	. "github.com/bsm/gomega"
 )
 
 func TestGinkgo(t *testing.T) {
diff --git a/extra/redisotel/go.sum b/extra/redisotel/go.sum
diff --git a/extra/redisprometheus/go.sum b/extra/redisprometheus/go.sum
diff --git a/go.mod b/go.mod
@@ -3,22 +3,15 @@ module github.com/redis/go-redis/v9
 go 1.17
 
 require (
+	github.com/bsm/ginkgo/v2 v2.5.0
+	github.com/bsm/gomega v1.20.0
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.25.0
 	github.com/stretchr/testify v1.8.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/customvet/go.sum b/internal/customvet/go.sum
@@ -1,7 +1,34 @@
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
 golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/hashtag/hashtag_test.go b/internal/hashtag/hashtag_test.go
@@ -3,8 +3,8 @@ package hashtag
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9/internal/rand"
 )
diff --git a/internal/hscan/hscan_test.go b/internal/hscan/hscan_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 type data struct {
diff --git a/internal/internal_test.go b/internal/internal_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/gomega"
 )
 
 func TestRetryBackoff(t *testing.T) {
diff --git a/internal/pool/conn_check_test.go b/internal/pool/conn_check_test.go
@@ -8,8 +8,8 @@ import (
 	"net/http/httptest"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 var _ = Describe("tests conn_check with real conns", func() {
diff --git a/internal/pool/main_test.go b/internal/pool/main_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 func TestGinkgoSuite(t *testing.T) {
diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9/internal/pool"
 )
diff --git a/internal/proto/proto_test.go b/internal/proto/proto_test.go
@@ -3,8 +3,8 @@ package proto_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 func TestGinkgoSuite(t *testing.T) {
diff --git a/internal/proto/scan_test.go b/internal/proto/scan_test.go
@@ -3,8 +3,8 @@ package proto_test
 import (
 	"encoding/json"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9/internal/proto"
 )
diff --git a/internal/proto/writer_test.go b/internal/proto/writer_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9/internal/proto"
 )
diff --git a/internal_test.go b/internal_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/redis/go-redis/v9/internal/pool"
 	"github.com/redis/go-redis/v9/internal/proto"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 )
 
 var _ = Describe("newClusterState", func() {
diff --git a/iterator_test.go b/iterator_test.go
@@ -3,8 +3,8 @@ package redis_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/main_test.go b/main_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/pipeline_test.go b/pipeline_test.go
@@ -3,8 +3,8 @@ package redis_test
 import (
 	"strconv"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/pool_test.go b/pool_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/pubsub_test.go b/pubsub_test.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/race_test.go b/race_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/redis_test.go b/redis_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/ring_test.go b/ring_test.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/sentinel_test.go b/sentinel_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"net"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/tx_test.go b/tx_test.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"sync"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )
diff --git a/universal_test.go b/universal_test.go
@@ -1,8 +1,8 @@
 package redis_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/bsm/ginkgo/v2"
+	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
 )

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/redis/go-redis/v9"`
`8`	`8`
`9`		`- . "github.com/onsi/ginkgo"`
`10`		`- . "github.com/onsi/gomega"`
	`9`	`+ . "github.com/bsm/ginkgo/v2"`
	`10`	`+ . "github.com/bsm/gomega"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var _ = Describe("Cmd", func() {`