redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-04-17 20:17:02 +03:00
Code

chore: cleanup

Browse Source
This commit is contained in:
Vladimir Mihailenco 2022-08-17 13:24:22 +03:00
parent eb8d6283df
commit 20ba6d59e6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ring_test.go
View File

@ -118,8 +118,6 @@ var _ = Describe("Redis Ring", func() {
Expect(ring.Len(), 2) Expect(ring.Len(), 2)
wantShard := ring.ShardByName("ringShardOne") wantShard := ring.ShardByName("ringShardOne")
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
ring.SetAddrs(map[string]string{ ring.SetAddrs(map[string]string{
"ringShardOne": ":" + ringShard1Port, "ringShardOne": ":" + ringShard1Port,
}) })
@ -127,8 +125,6 @@ var _ = Describe("Redis Ring", func() {
gotShard := ring.ShardByName("ringShardOne") gotShard := ring.ShardByName("ringShardOne")
Expect(gotShard).To(Equal(wantShard)) Expect(gotShard).To(Equal(wantShard))
ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
ring.SetAddrs(map[string]string{ ring.SetAddrs(map[string]string{
"ringShardOne": ":" + ringShard1Port, "ringShardOne": ":" + ringShard1Port,
"ringShardTwo": ":" + ringShard2Port, "ringShardTwo": ":" + ringShard2Port,
@ -145,6 +141,7 @@ var _ = Describe("Redis Ring", func() {
var err error var err error
ringShard3, err = startRedis(ringShard3Port) ringShard3, err = startRedis(ringShard3Port)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
defer ringShard3.Close()
shardName1 := "ringShardOne" shardName1 := "ringShardOne"
shardAddr1 := ":" + ringShard1Port shardAddr1 := ":" + ringShard1Port
@ -154,8 +151,7 @@ var _ = Describe("Redis Ring", func() {
wantShard2 := ring.ShardByName(shardName2) wantShard2 := ring.ShardByName(shardName2)
shardName3 := "ringShardThree" shardName3 := "ringShardThree"
shardAddr3 := ":" + ringShard3Port shardAddr3 := ":" + ringShard3Port
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
ring.SetAddrs(map[string]string{ ring.SetAddrs(map[string]string{
shardName1: shardAddr1, shardName1: shardAddr1,
shardName2: shardAddr2, shardName2: shardAddr2,
@ -169,8 +165,6 @@ var _ = Describe("Redis Ring", func() {
Expect(gotShard2).To(Equal(wantShard2)) Expect(gotShard2).To(Equal(wantShard2))
Expect(gotShard3).ToNot(BeNil()) Expect(gotShard3).ToNot(BeNil())
ctx, cancel = context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
ring.SetAddrs(map[string]string{ ring.SetAddrs(map[string]string{
shardName1: shardAddr1, shardName1: shardAddr1,
shardName2: shardAddr2, shardName2: shardAddr2,