Skip to content

Commit 7fa451c

Browse files
dimdim
committed
chore: fewer test dependencies
1 parent 805bfc2 commit 7fa451c

39 files changed

+616
-1513
lines changed

‎cluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"testing"
1313
"time"
1414

15-
. "github.com/onsi/ginkgo"
16-
. "github.com/onsi/gomega"
15+
. "github.com/bsm/ginkgo/v2"
16+
. "github.com/bsm/gomega"
1717
"github.com/stretchr/testify/assert"
1818

1919
"github.com/redis/go-redis/v9"

‎command_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/redis/go-redis/v9"
88

9-
. "github.com/onsi/ginkgo"
10-
. "github.com/onsi/gomega"
9+
. "github.com/bsm/ginkgo/v2"
10+
. "github.com/bsm/gomega"
1111
)
1212

1313
var _ = Describe("Cmd", func() {

‎commands_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99
"time"
1010

11-
. "github.com/onsi/ginkgo"
12-
. "github.com/onsi/gomega"
11+
. "github.com/bsm/ginkgo/v2"
12+
. "github.com/bsm/gomega"
1313

1414
"github.com/redis/go-redis/v9"
1515
"github.com/redis/go-redis/v9/internal/proto"

‎example/del-keys-without-ttl/go.sum

+8-144
Large diffs are not rendered by default.

‎example/hll/go.sum

+4-158
Large diffs are not rendered by default.

‎example/lua-scripting/go.sum

+4-158
Large diffs are not rendered by default.

‎example/otel/go.sum

+6-69
Large diffs are not rendered by default.

‎example/redis-bloom/go.sum

+4-158
Large diffs are not rendered by default.

‎example/scan-struct/go.sum

+4-158
Large diffs are not rendered by default.

‎extra/rediscensus/go.sum

+4-131
Large diffs are not rendered by default.

‎extra/rediscmd/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.15
55
replace github.com/redis/go-redis/v9 => ../..
66

77
require (
8-
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.25.0
8+
github.com/bsm/ginkgo/v2 v2.5.0
9+
github.com/bsm/gomega v1.20.0
1010
github.com/redis/go-redis/v9 v9.0.0-rc.4
1111
)

‎extra/rediscmd/go.sum

+4-158
Large diffs are not rendered by default.

‎extra/rediscmd/rediscmd_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package rediscmd
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/ginkgo/extensions/table"
8-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/ginkgo/v2/extensions/table"
8+
. "github.com/bsm/gomega"
99
)
1010

1111
func TestGinkgo(t *testing.T) {

‎extra/redisotel/go.sum

+5-153
Large diffs are not rendered by default.

‎extra/redisprometheus/go.sum

+488-7
Large diffs are not rendered by default.

‎go.mod

+2-9
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,15 @@ module github.com/redis/go-redis/v9
33
go 1.17
44

55
require (
6+
github.com/bsm/ginkgo/v2 v2.5.0
7+
github.com/bsm/gomega v1.20.0
68
github.com/cespare/xxhash/v2 v2.2.0
79
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f
8-
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.25.0
1010
github.com/stretchr/testify v1.8.1
1111
)
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.1 // indirect
15-
github.com/fsnotify/fsnotify v1.4.9 // indirect
16-
github.com/google/go-cmp v0.5.9 // indirect
17-
github.com/nxadm/tail v1.4.8 // indirect
1815
github.com/pmezard/go-difflib v1.0.0 // indirect
19-
golang.org/x/net v0.5.0 // indirect
20-
golang.org/x/sys v0.4.0 // indirect
21-
golang.org/x/text v0.6.0 // indirect
22-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
2316
gopkg.in/yaml.v3 v3.0.1 // indirect
2417
)

‎go.sum

+4-158
Large diffs are not rendered by default.

‎internal/customvet/go.sum

+27
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,34 @@
1+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
4+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
15
golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
26
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
7+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
8+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
9+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
10+
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
11+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
12+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
313
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
14+
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
17+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
420
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
521
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
22+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
23+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
24+
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
25+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
26+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
27+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
28+
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
29+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
30+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
31+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
632
golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
733
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
34+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎internal/hashtag/hashtag_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package hashtag
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/gomega"
88

99
"github.com/redis/go-redis/v9/internal/rand"
1010
)

‎internal/hscan/hscan_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
. "github.com/onsi/ginkgo"
10-
. "github.com/onsi/gomega"
9+
. "github.com/bsm/ginkgo/v2"
10+
. "github.com/bsm/gomega"
1111
)
1212

1313
type data struct {

‎internal/internal_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
. "github.com/onsi/gomega"
7+
. "github.com/bsm/gomega"
88
)
99

1010
func TestRetryBackoff(t *testing.T) {

‎internal/pool/conn_check_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"net/http/httptest"
99
"time"
1010

11-
. "github.com/onsi/ginkgo"
12-
. "github.com/onsi/gomega"
11+
. "github.com/bsm/ginkgo/v2"
12+
. "github.com/bsm/gomega"
1313
)
1414

1515
var _ = Describe("tests conn_check with real conns", func() {

‎internal/pool/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"testing"
1010
"time"
1111

12-
. "github.com/onsi/ginkgo"
13-
. "github.com/onsi/gomega"
12+
. "github.com/bsm/ginkgo/v2"
13+
. "github.com/bsm/gomega"
1414
)
1515

1616
func TestGinkgoSuite(t *testing.T) {

‎internal/pool/pool_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

10-
. "github.com/onsi/ginkgo"
11-
. "github.com/onsi/gomega"
10+
. "github.com/bsm/ginkgo/v2"
11+
. "github.com/bsm/gomega"
1212

1313
"github.com/redis/go-redis/v9/internal/pool"
1414
)

‎internal/proto/proto_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package proto_test
33
import (
44
"testing"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/gomega"
88
)
99

1010
func TestGinkgoSuite(t *testing.T) {

‎internal/proto/scan_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package proto_test
33
import (
44
"encoding/json"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/gomega"
88

99
"github.com/redis/go-redis/v9/internal/proto"
1010
)

‎internal/proto/writer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
. "github.com/onsi/ginkgo"
12-
. "github.com/onsi/gomega"
11+
. "github.com/bsm/ginkgo/v2"
12+
. "github.com/bsm/gomega"
1313

1414
"github.com/redis/go-redis/v9/internal/proto"
1515
)

‎internal_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/redis/go-redis/v9/internal/pool"
1313
"github.com/redis/go-redis/v9/internal/proto"
1414

15-
. "github.com/onsi/ginkgo"
16-
. "github.com/onsi/gomega"
15+
. "github.com/bsm/ginkgo/v2"
16+
. "github.com/bsm/gomega"
1717
)
1818

1919
var _ = Describe("newClusterState", func() {

‎iterator_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package redis_test
33
import (
44
"fmt"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/gomega"
88

99
"github.com/redis/go-redis/v9"
1010
)

‎main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"testing"
1111
"time"
1212

13-
. "github.com/onsi/ginkgo"
14-
. "github.com/onsi/gomega"
13+
. "github.com/bsm/ginkgo/v2"
14+
. "github.com/bsm/gomega"
1515

1616
"github.com/redis/go-redis/v9"
1717
)

‎pipeline_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package redis_test
33
import (
44
"strconv"
55

6-
. "github.com/onsi/ginkgo"
7-
. "github.com/onsi/gomega"
6+
. "github.com/bsm/ginkgo/v2"
7+
. "github.com/bsm/gomega"
88

99
"github.com/redis/go-redis/v9"
1010
)

‎pool_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"time"
66

7-
. "github.com/onsi/ginkgo"
8-
. "github.com/onsi/gomega"
7+
. "github.com/bsm/ginkgo/v2"
8+
. "github.com/bsm/gomega"
99

1010
"github.com/redis/go-redis/v9"
1111
)

‎pubsub_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"sync"
77
"time"
88

9-
. "github.com/onsi/ginkgo"
10-
. "github.com/onsi/gomega"
9+
. "github.com/bsm/ginkgo/v2"
10+
. "github.com/bsm/gomega"
1111

1212
"github.com/redis/go-redis/v9"
1313
)

‎race_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"testing"
1010
"time"
1111

12-
. "github.com/onsi/ginkgo"
13-
. "github.com/onsi/gomega"
12+
. "github.com/bsm/ginkgo/v2"
13+
. "github.com/bsm/gomega"
1414

1515
"github.com/redis/go-redis/v9"
1616
)

‎redis_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
. "github.com/onsi/ginkgo"
12-
. "github.com/onsi/gomega"
11+
. "github.com/bsm/ginkgo/v2"
12+
. "github.com/bsm/gomega"
1313

1414
"github.com/redis/go-redis/v9"
1515
)

‎ring_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"sync"
1010
"time"
1111

12-
. "github.com/onsi/ginkgo"
13-
. "github.com/onsi/gomega"
12+
. "github.com/bsm/ginkgo/v2"
13+
. "github.com/bsm/gomega"
1414

1515
"github.com/redis/go-redis/v9"
1616
)

‎sentinel_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"net"
66

7-
. "github.com/onsi/ginkgo"
8-
. "github.com/onsi/gomega"
7+
. "github.com/bsm/ginkgo/v2"
8+
. "github.com/bsm/gomega"
99

1010
"github.com/redis/go-redis/v9"
1111
)

‎tx_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"sync"
77

8-
. "github.com/onsi/ginkgo"
9-
. "github.com/onsi/gomega"
8+
. "github.com/bsm/ginkgo/v2"
9+
. "github.com/bsm/gomega"
1010

1111
"github.com/redis/go-redis/v9"
1212
)

‎universal_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package redis_test
22

33
import (
4-
. "github.com/onsi/ginkgo"
5-
. "github.com/onsi/gomega"
4+
. "github.com/bsm/ginkgo/v2"
5+
. "github.com/bsm/gomega"
66

77
"github.com/redis/go-redis/v9"
88
)

0 commit comments

Comments
 (0)