@@ -26,7 +26,7 @@ type mockConn struct {
26
26
ErrorFn func () error
27
27
CloseFn func ()
28
28
DialFn func () error
29
- AcquireFn func (ctx context. Context ) wire
29
+ AcquireFn func () wire
30
30
StoreFn func (w wire )
31
31
OverrideFn func (c conn )
32
32
AddrFn func () string
@@ -51,7 +51,7 @@ func (m *mockConn) Dial() error {
51
51
52
52
func (m * mockConn ) Acquire (ctx context.Context ) wire {
53
53
if m .AcquireFn != nil {
54
- return m .AcquireFn (ctx )
54
+ return m .AcquireFn ()
55
55
}
56
56
return nil
57
57
}
@@ -399,7 +399,7 @@ func TestSingleClient(t *testing.T) {
399
399
return e
400
400
},
401
401
}
402
- m .AcquireFn = func (_ context. Context ) wire {
402
+ m .AcquireFn = func () wire {
403
403
return w
404
404
}
405
405
if err := client .Dedicated (func (c DedicatedClient ) error {
@@ -434,7 +434,7 @@ func TestSingleClient(t *testing.T) {
434
434
closed = true
435
435
},
436
436
}
437
- m .AcquireFn = func (_ context. Context ) wire {
437
+ m .AcquireFn = func () wire {
438
438
return w
439
439
}
440
440
stored := false
@@ -500,7 +500,7 @@ func TestSingleClient(t *testing.T) {
500
500
closed = true
501
501
},
502
502
}
503
- m .AcquireFn = func (_ context. Context ) wire {
503
+ m .AcquireFn = func () wire {
504
504
return w
505
505
}
506
506
stored := false
@@ -544,7 +544,7 @@ func TestSingleClient(t *testing.T) {
544
544
t .Run ("Dedicate Delegate Release On Close" , func (t * testing.T ) {
545
545
stored := 0
546
546
w := & mockWire {}
547
- m .AcquireFn = func (_ context. Context ) wire { return w }
547
+ m .AcquireFn = func () wire { return w }
548
548
m .StoreFn = func (ww wire ) { stored ++ }
549
549
c , _ := client .Dedicate ()
550
550
@@ -558,7 +558,7 @@ func TestSingleClient(t *testing.T) {
558
558
t .Run ("Dedicate Delegate No Duplicate Release" , func (t * testing.T ) {
559
559
stored := 0
560
560
w := & mockWire {}
561
- m .AcquireFn = func (_ context. Context ) wire { return w }
561
+ m .AcquireFn = func () wire { return w }
562
562
m .StoreFn = func (ww wire ) { stored ++ }
563
563
c , cancel := client .Dedicate ()
564
564
@@ -573,7 +573,7 @@ func TestSingleClient(t *testing.T) {
573
573
})
574
574
575
575
t .Run ("Dedicate ErrDedicatedClientRecycled after released" , func (t * testing.T ) {
576
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {} }
576
+ m .AcquireFn = func () wire { return & mockWire {} }
577
577
check := func (err error ) {
578
578
if ! errors .Is (err , ErrDedicatedClientRecycled ) {
579
579
t .Fatalf ("unexpected err %v" , err )
@@ -1020,7 +1020,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1020
1020
newErrResult (ErrClosing ),
1021
1021
newResult (RedisMessage {typ : '+' , string : "Do" }, nil ),
1022
1022
)
1023
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn } }
1023
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn } }
1024
1024
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1025
1025
if v , err := cc .Do (context .Background (), c .B ().Get ().Key ("Do" ).Build ()).ToString (); err != nil || v != "Do" {
1026
1026
t .Fatalf ("unexpected response %v %v" , v , err )
@@ -1035,7 +1035,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1035
1035
c , m := setup ()
1036
1036
m .DoFn = makeDoFn (newErrResult (ErrClosing ))
1037
1037
m .ErrorFn = func () error { return ErrClosing }
1038
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn , ErrorFn : m .ErrorFn } }
1038
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn , ErrorFn : m .ErrorFn } }
1039
1039
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1040
1040
return cc .Do (context .Background (), c .B ().Get ().Key ("Do" ).Build ()).Error ()
1041
1041
}); ret != ErrClosing {
@@ -1046,7 +1046,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1046
1046
t .Run ("Dedicate Delegate Do ReadOnly NoRetry - ctx done" , func (t * testing.T ) {
1047
1047
c , m := setup ()
1048
1048
m .DoFn = makeDoFn (newErrResult (ErrClosing ))
1049
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn } }
1049
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn } }
1050
1050
ctx , cancel := context .WithCancel (context .Background ())
1051
1051
cancel ()
1052
1052
if ret := c .Dedicated (func (cc DedicatedClient ) error {
@@ -1062,7 +1062,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1062
1062
newErrResult (ErrClosing ),
1063
1063
newResult (RedisMessage {typ : '+' , string : "Do" }, nil ),
1064
1064
)
1065
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn } }
1065
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn } }
1066
1066
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1067
1067
if cli , ok := cc .(* dedicatedClusterClient ); ok {
1068
1068
cli .retryHandler = & mockRetryHandler {
@@ -1091,7 +1091,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1091
1091
t .Run ("Dedicate Delegate Do Write NoRetry" , func (t * testing.T ) {
1092
1092
c , m := setup ()
1093
1093
m .DoFn = makeDoFn (newErrResult (ErrClosing ))
1094
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn } }
1094
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn } }
1095
1095
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1096
1096
return cc .Do (context .Background (), c .B ().Set ().Key ("Do" ).Value ("Do" ).Build ()).Error ()
1097
1097
}); ret != ErrClosing {
@@ -1105,7 +1105,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1105
1105
[]RedisResult {newErrResult (ErrClosing )},
1106
1106
[]RedisResult {newResult (RedisMessage {typ : '+' , string : "Do" }, nil )},
1107
1107
)
1108
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1108
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1109
1109
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1110
1110
if v , err := cc .DoMulti (context .Background (), c .B ().Get ().Key ("Do" ).Build ())[0 ].ToString (); err != nil || v != "Do" {
1111
1111
t .Fatalf ("unexpected response %v %v" , v , err )
@@ -1120,7 +1120,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1120
1120
c , m := setup ()
1121
1121
m .DoMultiFn = makeDoMultiFn ([]RedisResult {newErrResult (ErrClosing )})
1122
1122
m .ErrorFn = func () error { return ErrClosing }
1123
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn , ErrorFn : m .ErrorFn } }
1123
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn , ErrorFn : m .ErrorFn } }
1124
1124
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1125
1125
return cc .DoMulti (context .Background (), c .B ().Get ().Key ("Do" ).Build ())[0 ].Error ()
1126
1126
}); ret != ErrClosing {
@@ -1131,7 +1131,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1131
1131
t .Run ("Dedicate Delegate DoMulti ReadOnly NoRetry - ctx done" , func (t * testing.T ) {
1132
1132
c , m := setup ()
1133
1133
m .DoMultiFn = makeDoMultiFn ([]RedisResult {newErrResult (ErrClosing )})
1134
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1134
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1135
1135
ctx , cancel := context .WithCancel (context .Background ())
1136
1136
cancel ()
1137
1137
if ret := c .Dedicated (func (cc DedicatedClient ) error {
@@ -1147,7 +1147,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1147
1147
[]RedisResult {newErrResult (ErrClosing )},
1148
1148
[]RedisResult {newResult (RedisMessage {typ : '+' , string : "Do" }, nil )},
1149
1149
)
1150
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1150
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1151
1151
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1152
1152
if cli , ok := cc .(* dedicatedClusterClient ); ok {
1153
1153
cli .retryHandler = & mockRetryHandler {
@@ -1176,7 +1176,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1176
1176
t .Run ("Dedicate Delegate DoMulti Write NoRetry" , func (t * testing.T ) {
1177
1177
c , m := setup ()
1178
1178
m .DoMultiFn = makeDoMultiFn ([]RedisResult {newErrResult (ErrClosing )})
1179
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1179
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1180
1180
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1181
1181
return cc .DoMulti (context .Background (), c .B ().Set ().Key ("Do" ).Value ("Do" ).Build ())[0 ].Error ()
1182
1182
}); ret != ErrClosing {
@@ -1187,7 +1187,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1187
1187
t .Run ("Delegate Receive Retry" , func (t * testing.T ) {
1188
1188
c , m := setup ()
1189
1189
m .ReceiveFn = makeReceiveFn (ErrClosing , nil )
1190
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1190
+ m .AcquireFn = func () wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1191
1191
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1192
1192
if err := cc .Receive (context .Background (), c .B ().Subscribe ().Channel ("Do" ).Build (), nil ); err != nil {
1193
1193
t .Fatalf ("unexpected response %v" , err )
@@ -1202,7 +1202,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1202
1202
c , m := setup ()
1203
1203
m .ReceiveFn = makeReceiveFn (ErrClosing )
1204
1204
m .ErrorFn = func () error { return ErrClosing }
1205
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {ReceiveFn : m .ReceiveFn , ErrorFn : m .ErrorFn } }
1205
+ m .AcquireFn = func () wire { return & mockWire {ReceiveFn : m .ReceiveFn , ErrorFn : m .ErrorFn } }
1206
1206
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1207
1207
return cc .Receive (context .Background (), c .B ().Subscribe ().Channel ("Do" ).Build (), nil )
1208
1208
}); ret != ErrClosing {
@@ -1213,7 +1213,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1213
1213
t .Run ("Delegate Receive NoRetry - ctx done" , func (t * testing.T ) {
1214
1214
c , m := setup ()
1215
1215
m .ReceiveFn = makeReceiveFn (ErrClosing )
1216
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1216
+ m .AcquireFn = func () wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1217
1217
ctx , cancel := context .WithCancel (context .Background ())
1218
1218
cancel ()
1219
1219
if ret := c .Dedicated (func (cc DedicatedClient ) error {
@@ -1226,7 +1226,7 @@ func SetupClientRetry(t *testing.T, fn func(mock *mockConn) Client) {
1226
1226
t .Run ("Delegate Receive NoRetry - not retryable" , func (t * testing.T ) {
1227
1227
c , m := setup ()
1228
1228
m .ReceiveFn = makeReceiveFn (ErrClosing , nil )
1229
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1229
+ m .AcquireFn = func () wire { return & mockWire {ReceiveFn : m .ReceiveFn } }
1230
1230
if ret := c .Dedicated (func (cc DedicatedClient ) error {
1231
1231
if cli , ok := cc .(* dedicatedClusterClient ); ok {
1232
1232
cli .retryHandler = & mockRetryHandler {
@@ -1377,7 +1377,7 @@ func TestSingleClientLoadingRetry(t *testing.T) {
1377
1377
}
1378
1378
return newResult (RedisMessage {typ : '+' , string : "OK" }, nil )
1379
1379
}
1380
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoFn : m .DoFn } }
1380
+ m .AcquireFn = func () wire { return & mockWire {DoFn : m .DoFn } }
1381
1381
1382
1382
err := client .Dedicated (func (c DedicatedClient ) error {
1383
1383
if v , err := c .Do (context .Background (), c .B ().Get ().Key ("test" ).Build ()).ToString (); err != nil || v != "OK" {
@@ -1400,7 +1400,7 @@ func TestSingleClientLoadingRetry(t *testing.T) {
1400
1400
}
1401
1401
return & redisresults {s : []RedisResult {newResult (RedisMessage {typ : '+' , string : "OK" }, nil )}}
1402
1402
}
1403
- m .AcquireFn = func (_ context. Context ) wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1403
+ m .AcquireFn = func () wire { return & mockWire {DoMultiFn : m .DoMultiFn } }
1404
1404
1405
1405
err := client .Dedicated (func (c DedicatedClient ) error {
1406
1406
resps := c .DoMulti (context .Background (), c .B ().Get ().Key ("test" ).Build ())
0 commit comments