refactor: simplify sqlx fail fast ping and simplify miniredis setup in test (#2897)

* chore(redistest): simplify miniredis setup in test

* refactor(sqlx): simplify sqlx fail fast ping

* chore: close connection if not available
This commit is contained in:
cong
2023-02-19 17:18:19 +08:00
committed by GitHub
parent d113e1352c
commit 64ab00e8e3
3 changed files with 14 additions and 55 deletions

View File

@@ -1761,21 +1761,7 @@ func TestRedis_WithPass(t *testing.T) {
func runOnRedis(t *testing.T, fn func(client *Redis)) {
logx.Disable()
s, err := miniredis.Run()
assert.Nil(t, err)
defer func() {
client, err := clientManager.GetResource(s.Addr(), func() (io.Closer, error) {
return nil, errors.New("should already exist")
})
if err != nil {
t.Error(err)
}
if client != nil {
_ = client.Close()
}
}()
s := miniredis.RunT(t)
fn(MustNewRedis(RedisConf{
Host: s.Addr(),
Type: NodeType,
@@ -1785,21 +1771,7 @@ func runOnRedis(t *testing.T, fn func(client *Redis)) {
func runOnRedisWithError(t *testing.T, fn func(client *Redis)) {
logx.Disable()
s, err := miniredis.Run()
assert.NoError(t, err)
defer func() {
client, err := clientManager.GetResource(s.Addr(), func() (io.Closer, error) {
return nil, errors.New("should already exist")
})
if err != nil {
t.Error(err)
}
if client != nil {
_ = client.Close()
}
}()
s := miniredis.RunT(t)
s.SetError("mock error")
fn(New(s.Addr()))
}