Skip to content

Commit 5dc79ef

Browse files
peczenyjpeczenyj
committed
run "make fmt" again
1 parent 64e2bde commit 5dc79ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+87
-558
lines changed

‎acl_commands_test.go‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,69 @@ import (
99
. "github.com/bsm/gomega"
1010
)
1111

12-
var TestUserName string = "goredis"
13-
var _ = Describe("ACL", func() {
14-
var client *redis.Client
15-
var ctx context.Context
16-
17-
BeforeEach(func() {
18-
ctx = context.Background()
19-
opt := redisOptions()
20-
client = redis.NewClient(opt)
21-
})
22-
23-
It("should ACL LOG", Label("NonRedisEnterprise"), func() {
24-
Expect(client.ACLLogReset(ctx).Err()).NotTo(HaveOccurred())
25-
err := client.Do(ctx, "acl", "setuser", "test", ">test", "on", "allkeys", "+get").Err()
26-
Expect(err).NotTo(HaveOccurred())
12+
var (
13+
TestUserName string = "goredis"
14+
_ = Describe("ACL", func() {
15+
var client *redis.Client
16+
var ctx context.Context
17+
18+
BeforeEach(func() {
19+
ctx = context.Background()
20+
opt := redisOptions()
21+
client = redis.NewClient(opt)
22+
})
23+
24+
It("should ACL LOG", Label("NonRedisEnterprise"), func() {
25+
Expect(client.ACLLogReset(ctx).Err()).NotTo(HaveOccurred())
26+
err := client.Do(ctx, "acl", "setuser", "test", ">test", "on", "allkeys", "+get").Err()
27+
Expect(err).NotTo(HaveOccurred())
2728

28-
clientAcl := redis.NewClient(redisOptions())
29-
clientAcl.Options().Username = "test"
30-
clientAcl.Options().Password = "test"
31-
clientAcl.Options().DB = 0
32-
_ = clientAcl.Set(ctx, "mystring", "foo", 0).Err()
33-
_ = clientAcl.HSet(ctx, "myhash", "foo", "bar").Err()
34-
_ = clientAcl.SAdd(ctx, "myset", "foo", "bar").Err()
29+
clientAcl := redis.NewClient(redisOptions())
30+
clientAcl.Options().Username = "test"
31+
clientAcl.Options().Password = "test"
32+
clientAcl.Options().DB = 0
33+
_ = clientAcl.Set(ctx, "mystring", "foo", 0).Err()
34+
_ = clientAcl.HSet(ctx, "myhash", "foo", "bar").Err()
35+
_ = clientAcl.SAdd(ctx, "myset", "foo", "bar").Err()
3536

36-
logEntries, err := client.ACLLog(ctx, 10).Result()
37-
Expect(err).NotTo(HaveOccurred())
38-
Expect(len(logEntries)).To(Equal(4))
39-
40-
for _, entry := range logEntries {
41-
Expect(entry.Reason).To(Equal("command"))
42-
Expect(entry.Context).To(Equal("toplevel"))
43-
Expect(entry.Object).NotTo(BeEmpty())
44-
Expect(entry.Username).To(Equal("test"))
45-
Expect(entry.AgeSeconds).To(BeNumerically(">=", 0))
46-
Expect(entry.ClientInfo).NotTo(BeNil())
47-
Expect(entry.EntryID).To(BeNumerically(">=", 0))
48-
Expect(entry.TimestampCreated).To(BeNumerically(">=", 0))
49-
Expect(entry.TimestampLastUpdated).To(BeNumerically(">=", 0))
50-
}
51-
52-
limitedLogEntries, err := client.ACLLog(ctx, 2).Result()
53-
Expect(err).NotTo(HaveOccurred())
54-
Expect(len(limitedLogEntries)).To(Equal(2))
37+
logEntries, err := client.ACLLog(ctx, 10).Result()
38+
Expect(err).NotTo(HaveOccurred())
39+
Expect(len(logEntries)).To(Equal(4))
40+
41+
for _, entry := range logEntries {
42+
Expect(entry.Reason).To(Equal("command"))
43+
Expect(entry.Context).To(Equal("toplevel"))
44+
Expect(entry.Object).NotTo(BeEmpty())
45+
Expect(entry.Username).To(Equal("test"))
46+
Expect(entry.AgeSeconds).To(BeNumerically(">=", 0))
47+
Expect(entry.ClientInfo).NotTo(BeNil())
48+
Expect(entry.EntryID).To(BeNumerically(">=", 0))
49+
Expect(entry.TimestampCreated).To(BeNumerically(">=", 0))
50+
Expect(entry.TimestampLastUpdated).To(BeNumerically(">=", 0))
51+
}
52+
53+
limitedLogEntries, err := client.ACLLog(ctx, 2).Result()
54+
Expect(err).NotTo(HaveOccurred())
55+
Expect(len(limitedLogEntries)).To(Equal(2))
5556

56-
// cleanup after creating the user
57-
err = client.Do(ctx, "acl", "deluser", "test").Err()
58-
Expect(err).NotTo(HaveOccurred())
59-
})
57+
// cleanup after creating the user
58+
err = client.Do(ctx, "acl", "deluser", "test").Err()
59+
Expect(err).NotTo(HaveOccurred())
60+
})
6061

61-
It("should ACL LOG RESET", Label("NonRedisEnterprise"), func() {
62-
// Call ACL LOG RESET
63-
resetCmd := client.ACLLogReset(ctx)
64-
Expect(resetCmd.Err()).NotTo(HaveOccurred())
65-
Expect(resetCmd.Val()).To(Equal("OK"))
62+
It("should ACL LOG RESET", Label("NonRedisEnterprise"), func() {
63+
// Call ACL LOG RESET
64+
resetCmd := client.ACLLogReset(ctx)
65+
Expect(resetCmd.Err()).NotTo(HaveOccurred())
66+
Expect(resetCmd.Val()).To(Equal("OK"))
6667

67-
// Verify that the log is empty after the reset
68-
logEntries, err := client.ACLLog(ctx, 10).Result()
69-
Expect(err).NotTo(HaveOccurred())
70-
Expect(len(logEntries)).To(Equal(0))
68+
// Verify that the log is empty after the reset
69+
logEntries, err := client.ACLLog(ctx, 10).Result()
70+
Expect(err).NotTo(HaveOccurred())
71+
Expect(len(logEntries)).To(Equal(0))
72+
})
7173
})
72-
73-
})
74+
)
7475
var _ = Describe("ACL user commands", Label("NonRedisEnterprise"), func() {
7576
var client *redis.Client
7677
var ctx context.Context

‎commands_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ var _ = Describe("Commands", func() {
459459
}
460460

461461
// read the defaults to set them back later
462-
for setting, _ := range expected {
462+
for setting := range expected {
463463
val, err := client.ConfigGet(ctx, setting).Result()
464464
Expect(err).NotTo(HaveOccurred())
465465
defaults[setting] = val[setting]

‎doctests/bf_tutorial_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,20 @@ func ExampleClient_bloom() {
2828

2929
// STEP_START bloom
3030
res1, err := rdb.BFReserve(ctx, "bikes:models", 0.01, 1000).Result()
31-
3231
if err != nil {
3332
panic(err)
3433
}
3534

3635
fmt.Println(res1) // >>> OK
3736

3837
res2, err := rdb.BFAdd(ctx, "bikes:models", "Smoky Mountain Striker").Result()
39-
4038
if err != nil {
4139
panic(err)
4240
}
4341

4442
fmt.Println(res2) // >>> true
4543

4644
res3, err := rdb.BFExists(ctx, "bikes:models", "Smoky Mountain Striker").Result()
47-
4845
if err != nil {
4946
panic(err)
5047
}
@@ -56,7 +53,6 @@ func ExampleClient_bloom() {
5653
"Cloudy City Cruiser",
5754
"Windy City Wippet",
5855
).Result()
59-
6056
if err != nil {
6157
panic(err)
6258
}
@@ -68,7 +64,6 @@ func ExampleClient_bloom() {
6864
"Cloudy City Cruiser",
6965
"Windy City Wippet",
7066
).Result()
71-
7267
if err != nil {
7368
panic(err)
7469
}

‎doctests/bitfield_tutorial_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func ExampleClient_bf() {
3030
res1, err := rdb.BitField(ctx, "bike:1:stats",
3131
"set", "u32", "#0", "1000",
3232
).Result()
33-
3433
if err != nil {
3534
panic(err)
3635
}
@@ -42,7 +41,6 @@ func ExampleClient_bf() {
4241
"incrby", "u32", "#0", "-50",
4342
"incrby", "u32", "#1", "1",
4443
).Result()
45-
4644
if err != nil {
4745
panic(err)
4846
}
@@ -54,7 +52,6 @@ func ExampleClient_bf() {
5452
"incrby", "u32", "#0", "500",
5553
"incrby", "u32", "#1", "1",
5654
).Result()
57-
5855
if err != nil {
5956
panic(err)
6057
}
@@ -65,7 +62,6 @@ func ExampleClient_bf() {
6562
"get", "u32", "#0",
6663
"get", "u32", "#1",
6764
).Result()
68-
6965
if err != nil {
7066
panic(err)
7167
}

‎doctests/bitmap_tutorial_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,20 @@ func ExampleClient_ping() {
2828

2929
// STEP_START ping
3030
res1, err := rdb.SetBit(ctx, "pings:2024-01-01-00:00", 123, 1).Result()
31-
3231
if err != nil {
3332
panic(err)
3433
}
3534

3635
fmt.Println(res1) // >>> 0
3736

3837
res2, err := rdb.GetBit(ctx, "pings:2024-01-01-00:00", 123).Result()
39-
4038
if err != nil {
4139
panic(err)
4240
}
4341

4442
fmt.Println(res2) // >>> 1
4543

4644
res3, err := rdb.GetBit(ctx, "pings:2024-01-01-00:00", 456).Result()
47-
4845
if err != nil {
4946
panic(err)
5047
}
@@ -71,7 +68,6 @@ func ExampleClient_bitcount() {
7168
// start with fresh database
7269
rdb.FlushDB(ctx)
7370
_, err := rdb.SetBit(ctx, "pings:2024-01-01-00:00", 123, 1).Result()
74-
7571
if err != nil {
7672
panic(err)
7773
}
@@ -83,7 +79,6 @@ func ExampleClient_bitcount() {
8379
Start: 0,
8480
End: 456,
8581
}).Result()
86-
8782
if err != nil {
8883
panic(err)
8984
}

‎doctests/cmds_generic_test.go‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,20 @@ func ExampleClient_del_cmd() {
3030

3131
// STEP_START del
3232
delResult1, err := rdb.Set(ctx, "key1", "Hello", 0).Result()
33-
3433
if err != nil {
3534
panic(err)
3635
}
3736

3837
fmt.Println(delResult1) // >>> OK
3938

4039
delResult2, err := rdb.Set(ctx, "key2", "World", 0).Result()
41-
4240
if err != nil {
4341
panic(err)
4442
}
4543

4644
fmt.Println(delResult2) // >>> OK
4745

4846
delResult3, err := rdb.Del(ctx, "key1", "key2", "key3").Result()
49-
5047
if err != nil {
5148
panic(err)
5249
}
@@ -77,71 +74,62 @@ func ExampleClient_expire_cmd() {
7774

7875
// STEP_START expire
7976
expireResult1, err := rdb.Set(ctx, "mykey", "Hello", 0).Result()
80-
8177
if err != nil {
8278
panic(err)
8379
}
8480

8581
fmt.Println(expireResult1) // >>> OK
8682

8783
expireResult2, err := rdb.Expire(ctx, "mykey", 10*time.Second).Result()
88-
8984
if err != nil {
9085
panic(err)
9186
}
9287

9388
fmt.Println(expireResult2) // >>> true
9489

9590
expireResult3, err := rdb.TTL(ctx, "mykey").Result()
96-
9791
if err != nil {
9892
panic(err)
9993
}
10094

10195
fmt.Println(math.Round(expireResult3.Seconds())) // >>> 10
10296

10397
expireResult4, err := rdb.Set(ctx, "mykey", "Hello World", 0).Result()
104-
10598
if err != nil {
10699
panic(err)
107100
}
108101

109102
fmt.Println(expireResult4) // >>> OK
110103

111104
expireResult5, err := rdb.TTL(ctx, "mykey").Result()
112-
113105
if err != nil {
114106
panic(err)
115107
}
116108

117109
fmt.Println(expireResult5) // >>> -1ns
118110

119111
expireResult6, err := rdb.ExpireXX(ctx, "mykey", 10*time.Second).Result()
120-
121112
if err != nil {
122113
panic(err)
123114
}
124115

125116
fmt.Println(expireResult6) // >>> false
126117

127118
expireResult7, err := rdb.TTL(ctx, "mykey").Result()
128-
129119
if err != nil {
130120
panic(err)
131121
}
132122

133123
fmt.Println(expireResult7) // >>> -1ns
134124

135125
expireResult8, err := rdb.ExpireNX(ctx, "mykey", 10*time.Second).Result()
136-
137126
if err != nil {
138127
panic(err)
139128
}
140129

141130
fmt.Println(expireResult8) // >>> true
142131

143132
expireResult9, err := rdb.TTL(ctx, "mykey").Result()
144-
145133
if err != nil {
146134
panic(err)
147135
}
@@ -178,15 +166,13 @@ func ExampleClient_ttl_cmd() {
178166

179167
// STEP_START ttl
180168
ttlResult1, err := rdb.Set(ctx, "mykey", "Hello", 10*time.Second).Result()
181-
182169
if err != nil {
183170
panic(err)
184171
}
185172

186173
fmt.Println(ttlResult1) // >>> OK
187174

188175
ttlResult2, err := rdb.TTL(ctx, "mykey").Result()
189-
190176
if err != nil {
191177
panic(err)
192178
}

0 commit comments

Comments
 (0)