zeromicro
/
go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(redistest): simplify redistest.CreateRedis API (#3086)

Browse Source
master
cong 2 years ago committed by GitHub
parent 6a692453dc
commit b49fc81618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 71 additions and 155 deletions
Show Stats Download Patch File Download Diff File

23
core/bloom/bloom_test.go
Unescape Escape View File

@ -4,13 +4,12 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/stores/redis/redistest" "github.com/zeromicro/go-zero/core/stores/redis/redistest"
) )
func TestRedisBitSet_New_Set_Test(t *testing.T) { func TestRedisBitSet_New_Set_Test(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
bitSet := newRedisBitSet(store, "test_key", 1024) bitSet := newRedisBitSet(store, "test_key", 1024)
isSetBefore, err := bitSet.check([]uint{0}) isSetBefore, err := bitSet.check([]uint{0})
@ -42,9 +41,7 @@ func TestRedisBitSet_New_Set_Test(t *testing.T) {
} }
func TestRedisBitSet_Add(t *testing.T) { func TestRedisBitSet_Add(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
filter := New(store, "test_key", 64) filter := New(store, "test_key", 64)
assert.Nil(t, filter.Add([]byte("hello"))) assert.Nil(t, filter.Add([]byte("hello")))
@ -55,11 +52,10 @@ func TestRedisBitSet_Add(t *testing.T) {
} }
func TestFilter_Exists(t *testing.T) { func TestFilter_Exists(t *testing.T) {
store, clean, err := redistest.CreateRedis() store, clean := redistest.CreateRedisWithClean(t)
assert.Nil(t, err)
rbs := New(store, "test", 64) rbs := New(store, "test", 64)
_, err = rbs.Exists([]byte{0, 1, 2}) _, err := rbs.Exists([]byte{0, 1, 2})
assert.NoError(t, err) assert.NoError(t, err)
clean() clean()
@ -69,12 +65,11 @@ func TestFilter_Exists(t *testing.T) {
} }
func TestRedisBitSet_check(t *testing.T) { func TestRedisBitSet_check(t *testing.T) {
store, clean, err := redistest.CreateRedis() store, clean := redistest.CreateRedisWithClean(t)
assert.Nil(t, err)
rbs := newRedisBitSet(store, "test", 0) rbs := newRedisBitSet(store, "test", 0)
assert.Error(t, rbs.set([]uint{0, 1, 2})) assert.Error(t, rbs.set([]uint{0, 1, 2}))
_, err = rbs.check([]uint{0, 1, 2}) _, err := rbs.check([]uint{0, 1, 2})
assert.Error(t, err) assert.Error(t, err)
rbs = newRedisBitSet(store, "test", 64) rbs = newRedisBitSet(store, "test", 64)
@ -88,8 +83,8 @@ func TestRedisBitSet_check(t *testing.T) {
} }
func TestRedisBitSet_set(t *testing.T) { func TestRedisBitSet_set(t *testing.T) {
store, clean, err := redistest.CreateRedis() logx.Disable()
assert.Nil(t, err) store, clean := redistest.CreateRedisWithClean(t)
rbs := newRedisBitSet(store, "test", 0) rbs := newRedisBitSet(store, "test", 0)
assert.Error(t, rbs.set([]uint{0, 1, 2})) assert.Error(t, rbs.set([]uint{0, 1, 2}))

4
core/limit/periodlimit_test.go
Unescape Escape View File

@ -33,9 +33,7 @@ func TestPeriodLimit_RedisUnavailable(t *testing.T) {
} }
func testPeriodLimit(t *testing.T, opts ...PeriodOption) { func testPeriodLimit(t *testing.T, opts ...PeriodOption) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
seconds = 1 seconds = 1

8
core/limit/tokenlimit_test.go
Unescape Escape View File

@ -70,9 +70,7 @@ func TestTokenLimit_Rescue(t *testing.T) {
} }
func TestTokenLimit_Take(t *testing.T) { func TestTokenLimit_Take(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
total = 100 total = 100
@ -92,9 +90,7 @@ func TestTokenLimit_Take(t *testing.T) {
} }
func TestTokenLimit_TakeBurst(t *testing.T) { func TestTokenLimit_TakeBurst(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
total = 100 total = 100

12
core/stores/cache/cache_test.go vendored
Unescape Escape View File

@ -112,12 +112,8 @@ func (mc *mockedNode) TakeWithExpireCtx(ctx context.Context, val any, key string
func TestCache_SetDel(t *testing.T) { func TestCache_SetDel(t *testing.T) {
t.Run("test set del", func(t *testing.T) { t.Run("test set del", func(t *testing.T) {
const total = 1000 const total = 1000
r1, clean1, err := redistest.CreateRedis() r1 := redistest.CreateRedis(t)
assert.Nil(t, err) r2 := redistest.CreateRedis(t)
defer clean1()
r2, clean2, err := redistest.CreateRedis()
assert.Nil(t, err)
defer clean2()
conf := ClusterConf{ conf := ClusterConf{
{ {
RedisConf: redis.RedisConf{ RedisConf: redis.RedisConf{
@ -193,9 +189,7 @@ func TestCache_SetDel(t *testing.T) {
func TestCache_OneNode(t *testing.T) { func TestCache_OneNode(t *testing.T) {
const total = 1000 const total = 1000
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
conf := ClusterConf{ conf := ClusterConf{
{ {
RedisConf: redis.RedisConf{ RedisConf: redis.RedisConf{

44
core/stores/cache/cachenode_test.go vendored
Unescape Escape View File

@ -34,10 +34,8 @@ func init() {
func TestCacheNode_DelCache(t *testing.T) { func TestCacheNode_DelCache(t *testing.T) {
t.Run("del cache", func(t *testing.T) { t.Run("del cache", func(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
store.Type = redis.ClusterType store.Type = redis.ClusterType
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -84,9 +82,7 @@ func TestCacheNode_DelCache(t *testing.T) {
} }
func TestCacheNode_DelCacheWithErrors(t *testing.T) { func TestCacheNode_DelCacheWithErrors(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
store.Type = redis.ClusterType store.Type = redis.ClusterType
cn := cacheNode{ cn := cacheNode{
@ -122,9 +118,7 @@ func TestCacheNode_InvalidCache(t *testing.T) {
} }
func TestCacheNode_SetWithExpire(t *testing.T) { func TestCacheNode_SetWithExpire(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -139,14 +133,12 @@ func TestCacheNode_SetWithExpire(t *testing.T) {
} }
func TestCacheNode_Take(t *testing.T) { func TestCacheNode_Take(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := NewNode(store, syncx.NewSingleFlight(), NewStat("any"), errTestNotFound, cn := NewNode(store, syncx.NewSingleFlight(), NewStat("any"), errTestNotFound,
WithExpiry(time.Second), WithNotFoundExpiry(time.Second)) WithExpiry(time.Second), WithNotFoundExpiry(time.Second))
var str string var str string
err = cn.Take(&str, "any", func(v any) error { err := cn.Take(&str, "any", func(v any) error {
*v.(*string) = "value" *v.(*string) = "value"
return nil return nil
}) })
@ -174,9 +166,7 @@ func TestCacheNode_TakeBadRedis(t *testing.T) {
} }
func TestCacheNode_TakeNotFound(t *testing.T) { func TestCacheNode_TakeNotFound(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -188,7 +178,7 @@ func TestCacheNode_TakeNotFound(t *testing.T) {
errNotFound: errTestNotFound, errNotFound: errTestNotFound,
} }
var str string var str string
err = cn.Take(&str, "any", func(v any) error { err := cn.Take(&str, "any", func(v any) error {
return errTestNotFound return errTestNotFound
}) })
assert.True(t, cn.IsNotFound(err)) assert.True(t, cn.IsNotFound(err))
@ -213,9 +203,7 @@ func TestCacheNode_TakeNotFound(t *testing.T) {
} }
func TestCacheNode_TakeNotFoundButChangedByOthers(t *testing.T) { func TestCacheNode_TakeNotFoundButChangedByOthers(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.NoError(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -228,7 +216,7 @@ func TestCacheNode_TakeNotFoundButChangedByOthers(t *testing.T) {
} }
var str string var str string
err = cn.Take(&str, "any", func(v any) error { err := cn.Take(&str, "any", func(v any) error {
store.Set("any", "foo") store.Set("any", "foo")
return errTestNotFound return errTestNotFound
}) })
@ -242,9 +230,7 @@ func TestCacheNode_TakeNotFoundButChangedByOthers(t *testing.T) {
} }
func TestCacheNode_TakeWithExpire(t *testing.T) { func TestCacheNode_TakeWithExpire(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -256,7 +242,7 @@ func TestCacheNode_TakeWithExpire(t *testing.T) {
errNotFound: errors.New("any"), errNotFound: errors.New("any"),
} }
var str string var str string
err = cn.TakeWithExpire(&str, "any", func(v any, expire time.Duration) error { err := cn.TakeWithExpire(&str, "any", func(v any, expire time.Duration) error {
*v.(*string) = "value" *v.(*string) = "value"
return nil return nil
}) })
@ -269,9 +255,7 @@ func TestCacheNode_TakeWithExpire(t *testing.T) {
} }
func TestCacheNode_String(t *testing.T) { func TestCacheNode_String(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,
@ -286,9 +270,7 @@ func TestCacheNode_String(t *testing.T) {
} }
func TestCacheValueWithBigInt(t *testing.T) { func TestCacheValueWithBigInt(t *testing.T) {
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
cn := cacheNode{ cn := cacheNode{
rds: store, rds: store,

27
core/stores/redis/redistest/redistest.go
Unescape Escape View File

@ -1,31 +1,20 @@
package redistest package redistest
import ( import (
"time" "testing"
"github.com/alicebob/miniredis/v2" "github.com/alicebob/miniredis/v2"
"github.com/zeromicro/go-zero/core/lang"
"github.com/zeromicro/go-zero/core/stores/redis" "github.com/zeromicro/go-zero/core/stores/redis"
) )
// CreateRedis returns an in process redis.Redis. // CreateRedis returns an in process redis.Redis.
func CreateRedis() (r *redis.Redis, clean func(), err error) { func CreateRedis(t *testing.T) *redis.Redis {
mr, err := miniredis.Run() r, _ := CreateRedisWithClean(t)
if err != nil { return r
return nil, nil, err
} }
return redis.New(mr.Addr()), func() { // CreateRedisWithClean returns an in process redis.Redis and a clean function.
ch := make(chan lang.PlaceholderType) func CreateRedisWithClean(t *testing.T) (r *redis.Redis, clean func()) {
mr := miniredis.RunT(t)
go func() { return redis.New(mr.Addr()), mr.Close
mr.Close()
close(ch)
}()
select {
case <-ch:
case <-time.After(time.Second):
}
}, nil
} }

94
core/stores/sqlc/cachedsql_test.go
Unescape Escape View File

@ -33,13 +33,11 @@ func init() {
func TestCachedConn_GetCache(t *testing.T) { func TestCachedConn_GetCache(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10))
var value string var value string
err = c.GetCache("any", &value) err := c.GetCache("any", &value)
assert.Equal(t, ErrNotFound, err) assert.Equal(t, ErrNotFound, err)
r.Set("any", `"value"`) r.Set("any", `"value"`)
err = c.GetCache("any", &value) err = c.GetCache("any", &value)
@ -49,15 +47,13 @@ func TestCachedConn_GetCache(t *testing.T) {
func TestStat(t *testing.T) { func TestStat(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10))
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
var str string var str string
err = c.QueryRow(&str, "name", func(conn sqlx.SqlConn, v any) error { err := c.QueryRow(&str, "name", func(conn sqlx.SqlConn, v any) error {
*v.(*string) = "zero" *v.(*string) = "zero"
return nil return nil
}) })
@ -72,9 +68,7 @@ func TestStat(t *testing.T) {
func TestCachedConn_QueryRowIndex_NoCache(t *testing.T) { func TestCachedConn_QueryRowIndex_NoCache(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewConn(dummySqlConn{}, cache.CacheConf{ c := NewConn(dummySqlConn{}, cache.CacheConf{
{ {
@ -87,7 +81,7 @@ func TestCachedConn_QueryRowIndex_NoCache(t *testing.T) {
}, cache.WithExpiry(time.Second*10)) }, cache.WithExpiry(time.Second*10))
var str string var str string
err = c.QueryRowIndex(&str, "index", func(s any) string { err := c.QueryRowIndex(&str, "index", func(s any) string {
return fmt.Sprintf("%s/1234", s) return fmt.Sprintf("%s/1234", s)
}, func(conn sqlx.SqlConn, v any) (any, error) { }, func(conn sqlx.SqlConn, v any) (any, error) {
*v.(*string) = "zero" *v.(*string) = "zero"
@ -121,16 +115,14 @@ func TestCachedConn_QueryRowIndex_NoCache(t *testing.T) {
func TestCachedConn_QueryRowIndex_HasCache(t *testing.T) { func TestCachedConn_QueryRowIndex_HasCache(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10), c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10),
cache.WithNotFoundExpiry(time.Second)) cache.WithNotFoundExpiry(time.Second))
var str string var str string
r.Set("index", `"primary"`) r.Set("index", `"primary"`)
err = c.QueryRowIndex(&str, "index", func(s any) string { err := c.QueryRowIndex(&str, "index", func(s any) string {
return fmt.Sprintf("%s/1234", s) return fmt.Sprintf("%s/1234", s)
}, func(conn sqlx.SqlConn, v any) (any, error) { }, func(conn sqlx.SqlConn, v any) (any, error) {
assert.Fail(t, "should not go here") assert.Fail(t, "should not go here")
@ -211,16 +203,14 @@ func TestCachedConn_QueryRowIndex_HasCache_IntPrimary(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10), c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10),
cache.WithNotFoundExpiry(time.Second)) cache.WithNotFoundExpiry(time.Second))
var str string var str string
r.Set("index", test.primaryCache) r.Set("index", test.primaryCache)
err = c.QueryRowIndex(&str, "index", func(s any) string { err := c.QueryRowIndex(&str, "index", func(s any) string {
return fmt.Sprintf("%v/1234", s) return fmt.Sprintf("%v/1234", s)
}, func(conn sqlx.SqlConn, v any) (any, error) { }, func(conn sqlx.SqlConn, v any) (any, error) {
assert.Fail(t, "should not go here") assert.Fail(t, "should not go here")
@ -251,16 +241,14 @@ func TestCachedConn_QueryRowIndex_HasWrongCache(t *testing.T) {
for k, v := range caches { for k, v := range caches {
t.Run(k+"/"+v, func(t *testing.T) { t.Run(k+"/"+v, func(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10), c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10),
cache.WithNotFoundExpiry(time.Second)) cache.WithNotFoundExpiry(time.Second))
var str string var str string
r.Set(k, v) r.Set(k, v)
err = c.QueryRowIndex(&str, "index", func(s any) string { err := c.QueryRowIndex(&str, "index", func(s any) string {
return fmt.Sprintf("%s/1234", s) return fmt.Sprintf("%s/1234", s)
}, func(conn sqlx.SqlConn, v any) (any, error) { }, func(conn sqlx.SqlConn, v any) (any, error) {
*v.(*string) = "xin" *v.(*string) = "xin"
@ -306,15 +294,13 @@ func TestStatCacheFails(t *testing.T) {
func TestStatDbFails(t *testing.T) { func TestStatDbFails(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10))
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
var str string var str string
err = c.QueryRow(&str, "name", func(conn sqlx.SqlConn, v any) error { err := c.QueryRow(&str, "name", func(conn sqlx.SqlConn, v any) error {
return errors.New("db failed") return errors.New("db failed")
}) })
assert.NotNil(t, err) assert.NotNil(t, err)
@ -327,9 +313,7 @@ func TestStatDbFails(t *testing.T) {
func TestStatFromMemory(t *testing.T) { func TestStatFromMemory(t *testing.T) {
resetStats() resetStats()
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(dummySqlConn{}, r, cache.WithExpiry(time.Second*10))
@ -385,9 +369,7 @@ func TestStatFromMemory(t *testing.T) {
} }
func TestCachedConnQueryRow(t *testing.T) { func TestCachedConnQueryRow(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
key = "user" key = "user"
@ -397,7 +379,7 @@ func TestCachedConnQueryRow(t *testing.T) {
var user string var user string
var ran bool var ran bool
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30))
err = c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error { err := c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error {
ran = true ran = true
user = value user = value
return nil return nil
@ -413,9 +395,7 @@ func TestCachedConnQueryRow(t *testing.T) {
} }
func TestCachedConnQueryRowFromCache(t *testing.T) { func TestCachedConnQueryRowFromCache(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
key = "user" key = "user"
@ -426,7 +406,7 @@ func TestCachedConnQueryRowFromCache(t *testing.T) {
var ran bool var ran bool
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30))
assert.Nil(t, c.SetCache(key, value)) assert.Nil(t, c.SetCache(key, value))
err = c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error { err := c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error {
ran = true ran = true
user = value user = value
return nil return nil
@ -442,9 +422,7 @@ func TestCachedConnQueryRowFromCache(t *testing.T) {
} }
func TestQueryRowNotFound(t *testing.T) { func TestQueryRowNotFound(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const key = "user" const key = "user"
var conn trackedConn var conn trackedConn
@ -452,7 +430,7 @@ func TestQueryRowNotFound(t *testing.T) {
var ran int var ran int
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30))
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
err = c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error { err := c.QueryRow(&user, key, func(conn sqlx.SqlConn, v any) error {
ran++ ran++
return sql.ErrNoRows return sql.ErrNoRows
}) })
@ -462,13 +440,11 @@ func TestQueryRowNotFound(t *testing.T) {
} }
func TestCachedConnExec(t *testing.T) { func TestCachedConnExec(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
var conn trackedConn var conn trackedConn
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10))
_, err = c.ExecNoCache("delete from user_table where id='kevin'") _, err := c.ExecNoCache("delete from user_table where id='kevin'")
assert.Nil(t, err) assert.Nil(t, err)
assert.True(t, conn.execValue) assert.True(t, conn.execValue)
} }
@ -514,26 +490,22 @@ func TestCachedConnExecDropCacheFailed(t *testing.T) {
} }
func TestCachedConnQueryRows(t *testing.T) { func TestCachedConnQueryRows(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
var conn trackedConn var conn trackedConn
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10))
var users []string var users []string
err = c.QueryRowsNoCache(&users, "select user from user_table where id='kevin'") err := c.QueryRowsNoCache(&users, "select user from user_table where id='kevin'")
assert.Nil(t, err) assert.Nil(t, err)
assert.True(t, conn.queryRowsValue) assert.True(t, conn.queryRowsValue)
} }
func TestCachedConnTransact(t *testing.T) { func TestCachedConnTransact(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
var conn trackedConn var conn trackedConn
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*10))
err = c.Transact(func(session sqlx.Session) error { err := c.Transact(func(session sqlx.Session) error {
return nil return nil
}) })
assert.Nil(t, err) assert.Nil(t, err)
@ -541,9 +513,7 @@ func TestCachedConnTransact(t *testing.T) {
} }
func TestQueryRowNoCache(t *testing.T) { func TestQueryRowNoCache(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
const ( const (
key = "user" key = "user"
@ -557,20 +527,18 @@ func TestQueryRowNoCache(t *testing.T) {
return nil return nil
}} }}
c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30)) c := NewNodeConn(&conn, r, cache.WithExpiry(time.Second*30))
err = c.QueryRowNoCache(&user, key) err := c.QueryRowNoCache(&user, key)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, value, user) assert.Equal(t, value, user)
assert.True(t, ran) assert.True(t, ran)
} }
func TestNewConnWithCache(t *testing.T) { func TestNewConnWithCache(t *testing.T) {
r, clean, err := redistest.CreateRedis() r := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
var conn trackedConn var conn trackedConn
c := NewConnWithCache(&conn, cache.NewNode(r, singleFlights, stats, sql.ErrNoRows)) c := NewConnWithCache(&conn, cache.NewNode(r, singleFlights, stats, sql.ErrNoRows))
_, err = c.ExecNoCache("delete from user_table where id='kevin'") _, err := c.ExecNoCache("delete from user_table where id='kevin'")
assert.Nil(t, err) assert.Nil(t, err)
assert.True(t, conn.execValue) assert.True(t, conn.execValue)
} }

4
zrpc/internal/auth/auth_test.go
Unescape Escape View File

@ -43,9 +43,7 @@ func TestAuthenticator(t *testing.T) {
}, },
} }
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {

8
zrpc/internal/serverinterceptors/authinterceptor_test.go
Unescape Escape View File

@ -45,9 +45,7 @@ func TestStreamAuthorizeInterceptor(t *testing.T) {
}, },
} }
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
@ -111,9 +109,7 @@ func TestUnaryAuthorizeInterceptor(t *testing.T) {
}, },
} }
store, clean, err := redistest.CreateRedis() store := redistest.CreateRedis(t)
assert.Nil(t, err)
defer clean()
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {

Write Preview
Loading…
Cancel
Save