gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(test): change erroris target and err

Browse Source 
. #1000042638

Signed-off-by: slasher <shenjie1@oppo.com>
This commit is contained in:
slasher 2025-06-19 10:14:14 +08:00
parent 49d847fec5
commit 22bb533794
26 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blobstore/access/controller/shard_test.go
View File

@ -671,7 +671,7 @@ func TestShardUpdate(t *testing.T) {
},
}
err = svr.handleShardUpdate(ctx, item)
require.ErrorIs(t, errCatalogNoLeader, err)
require.ErrorIs(t, err, errCatalogNoLeader)
sd, exist := svr.getShardNoLock(shardID)
require.True(t, exist)

2
blobstore/access/stream/stream_blob_test.go
View File

@ -259,7 +259,7 @@ func TestStreamBlobList(t *testing.T) {
h.shardnodeClient.(*mocks.MockShardnodeAccess).EXPECT().ListBlob(gAny, gAny, gAny).Return(shardnode.ListBlobRet{}, errcode.ErrShardRouteVersionNeedUpdate).Times(3)
ret, err := h.ListBlob(ctx, &args)
require.NotNil(t, err)
require.ErrorIs(t, errcode.ErrShardRouteVersionNeedUpdate, err)
require.ErrorIs(t, err, errcode.ErrShardRouteVersionNeedUpdate)
require.Equal(t, 0, len(ret.Blobs))
// list one shard, 3 blob

10
blobstore/api/access/client_test.go
View File

@ -690,7 +690,7 @@ func TestAccessClientPutMaxBlobsLength(t *testing.T) {
}
_, _, err := client.Put(randCtx(), &args)
require.ErrorIs(t, cs.err, err)
require.ErrorIs(t, err, cs.err)
}
}
@ -776,12 +776,12 @@ func TestAccessClientDelete(t *testing.T) {
{
locs, err := client.Delete(randCtx(), nil)
require.Nil(t, locs)
require.ErrorIs(t, errcode.ErrIllegalArguments, err)
require.ErrorIs(t, err, errcode.ErrIllegalArguments)
}
{
locs, err := client.Delete(randCtx(), &access.DeleteArgs{})
require.Nil(t, locs)
require.ErrorIs(t, errcode.ErrIllegalArguments, err)
require.ErrorIs(t, err, errcode.ErrIllegalArguments)
}
{
locs, err := client.Delete(randCtx(), &access.DeleteArgs{
@ -803,7 +803,7 @@ func TestAccessClientDelete(t *testing.T) {
}
locs, err := client.Delete(randCtx(), args)
require.Equal(t, args.Locations, locs)
require.ErrorIs(t, errcode.ErrIllegalArguments, err)
require.ErrorIs(t, err, errcode.ErrIllegalArguments)
}
{
loc := proto.Location{Size_: 100, Slices: make([]proto.Slice, 0)}
@ -892,7 +892,7 @@ func TestAccessClientPutAtToken(t *testing.T) {
Body: bytes.NewBuffer(buff),
}
_, _, err := client.Put(randCtx(), &args)
require.ErrorIs(t, errcode.ErrUnexpected, err)
require.ErrorIs(t, err, errcode.ErrUnexpected)
}
}

8
blobstore/blobnode/core/blobfile_test.go
View File

@ -94,7 +94,7 @@ func TestBlobFile_Op(t *testing.T) {
cancel()
n, err = ef.WriteAtCtx(ctx, data, 0)
require.ErrorIs(t, context.Canceled, err)
require.ErrorIs(t, err, context.Canceled)
require.Equal(t, 0, n)
// ReadAtCtx
@ -107,7 +107,7 @@ func TestBlobFile_Op(t *testing.T) {
cancel()
n, err = ef.ReadAtCtx(ctx, buf, 0)
require.ErrorIs(t, context.Canceled, err)
require.ErrorIs(t, err, context.Canceled)
require.Equal(t, 0, n)
// stat
@ -194,7 +194,7 @@ func TestBlobFile_doTaskFnCtxCancel(t *testing.T) {
args.TaskFn()
})
n, err = ef.WriteAtCtx(ctx, data, 0)
require.ErrorIs(t, context.Canceled, err)
require.ErrorIs(t, err, context.Canceled)
require.Equal(t, 0, n)
// ReadAtCtx
@ -213,6 +213,6 @@ func TestBlobFile_doTaskFnCtxCancel(t *testing.T) {
args.TaskFn()
})
n, err = ef.ReadAtCtx(ctx, buf, 0)
require.ErrorIs(t, context.Canceled, err)
require.ErrorIs(t, err, context.Canceled)
require.Equal(t, 0, n)
}

2
blobstore/clustermgr/cluster/blobnode_mgr_test.go
View File

@ -147,7 +147,7 @@ func TestDiskMgr_Dropping(t *testing.T) {
// set status when disk is dropping, return ErrChangeDiskStatusNotAllow
err = testDiskMgr.SetStatus(ctx, 1, proto.DiskStatusBroken, false)
require.ErrorIs(t, apierrors.ErrChangeDiskStatusNotAllow, err)
require.ErrorIs(t, err, apierrors.ErrChangeDiskStatusNotAllow)
droppingList, err = testDiskMgr.ListDroppingDisk(ctx)
require.NoError(t, err)

4
blobstore/common/crc32block/request_body_test.go
View File

@ -114,7 +114,7 @@ func TestBodyDecoderMissmatch(t *testing.T) {
rb := make([]byte, size)
_, err := io.ReadFull(decoder, rb)
require.ErrorIs(t, ErrMismatchedCrc, err)
require.ErrorIs(t, err, ErrMismatchedCrc)
}
type closedReader struct {
@ -145,7 +145,7 @@ func TestBodyReadClosed(t *testing.T) {
decoder.Close()
rb := make([]byte, size)
_, err := io.ReadFull(decoder, rb)
require.ErrorIs(t, ErrReadOnClosed, err)
require.ErrorIs(t, err, ErrReadOnClosed)
}
func benchmarkCode(b *testing.B, newFunc func(io.Reader) io.ReadCloser) {

4
blobstore/common/crc32block/sized_coder_test.go
View File

@ -140,7 +140,7 @@ func TestSizedCoderBase(t *testing.T) {
require.Equal(t, encodeSize, nn, logName)
require.Equal(t, clientBody.rhasher.Sum32(), serverBody.whasher.Sum32(), logName)
_, err = decodeBodyWt.WriteTo(serverBody)
require.ErrorIs(t, io.EOF, err, logName)
require.ErrorIs(t, err, io.EOF, logName)
} else {
b := make([]byte, size)
n, err := io.ReadFull(decodeBody, b)
@ -149,7 +149,7 @@ func TestSizedCoderBase(t *testing.T) {
serverBody.Write(b)
require.Equal(t, clientBody.rhasher.Sum32(), serverBody.whasher.Sum32(), logName)
_, err = decodeBody.Read(make([]byte, 1))
require.ErrorIs(t, io.EOF, err, logName)
require.ErrorIs(t, err, io.EOF, logName)
}
decodeBody.Close()
decodeBody = nil

8
blobstore/common/ec/buf_test.go
View File

@ -115,9 +115,9 @@ func TestGetBufferSize(t *testing.T) {
require.Equal(t, shardSize*(cm.N+cm.M+cm.L), sizes.ECSize)
_, err = ec.GetBufferSizes(0, cm)
require.ErrorIs(t, ec.ErrShortData, err)
require.ErrorIs(t, err, ec.ErrShortData)
_, err = ec.GetBufferSizes(-1, cm)
require.ErrorIs(t, ec.ErrShortData, err)
require.ErrorIs(t, err, ec.ErrShortData)
}
func TestBufferResize(t *testing.T) {
@ -132,7 +132,7 @@ func TestBufferResize(t *testing.T) {
// // pool limited
// _, err = ec.NewBuffer(kb, cm, memPool)
// require.ErrorIs(t, rp.ErrPoolLimit, err)
// require.ErrorIs(t, err, rp.ErrPoolLimit)
err = buffer.Resize(kb + 512)
require.NoError(t, err)
@ -141,7 +141,7 @@ func TestBufferResize(t *testing.T) {
// // pool limited
// _, err = ec.NewBuffer(kb, cm, memPool)
// require.ErrorIs(t, rp.ErrPoolLimit, err)
// require.ErrorIs(t, err, rp.ErrPoolLimit)
// mb pool, release kb64 pool
err = buffer.Resize(kb64)

2
blobstore/common/raft/manager_test.go
View File

@ -366,7 +366,7 @@ func TestManager_GroupInMultiServer(t *testing.T) {
err := groups[leaderIndex].Truncate(ctx, 3)
require.NoError(t, err)
_, err = groups[leaderIndex].storage.Term(3)
require.ErrorIs(t, raft.ErrCompacted, err)
require.ErrorIs(t, err, raft.ErrCompacted)
term, err := groups[leaderIndex].storage.Term(4)
require.NoError(t, err)
require.Equal(t, uint64(1), term)

2
blobstore/common/resourcepool/pool_test.go
View File

@ -63,7 +63,7 @@ func TestPoolNoLimit(t *testing.T) {
require.Equal(t, 0, p.Idle())
_, err := p.Get()
require.ErrorIs(t, rp.ErrPoolLimit, err)
require.ErrorIs(t, err, rp.ErrPoolLimit)
}
{
p := rp.NewPool(func() interface{} {

4
blobstore/common/rpc/error_test.go
View File

@ -39,7 +39,7 @@ func TestErrorBase(t *testing.T) {
{
errBase := NewError(400, "", errors.New(""))
err := NewError(499, "Unknown", errBase)
require.ErrorIs(t, errBase, errors.Unwrap(err))
require.ErrorIs(t, errors.Unwrap(err), errBase)
}
{
@ -81,7 +81,7 @@ func TestErrorBase(t *testing.T) {
})
require.Equal(t, 222, status)
require.Equal(t, "CODE", code)
require.ErrorIs(t, errBase, err)
require.ErrorIs(t, err, errBase)
}
{

10
blobstore/common/rpc2/body_test.go
View File

@ -29,11 +29,11 @@ func TestRpc2Body(t *testing.T) {
b.remain = 0
_, err := b.WriteTo(io.Discard)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
b.remain = 1
_, err = b.WriteTo(LimitWriter(io.Discard, 2))
require.ErrorIs(t, io.ErrShortWrite, err)
require.ErrorIs(t, err, io.ErrShortWrite)
}
func TestRpc2ReadFrame(t *testing.T) {
@ -48,7 +48,7 @@ func TestRpc2ReadFrame(t *testing.T) {
frame.Write([]byte{0xee})
conn.WriteFrame(frame)
_, err = conn.ReadFrame(testCtx)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
{
conn, err := cli.Connector.Get(testCtx, addr)
@ -57,7 +57,7 @@ func TestRpc2ReadFrame(t *testing.T) {
frame.Write([]byte{0x1, 0x00, 0x00, 0x00})
conn.WriteFrame(frame)
_, err = conn.ReadFrame(testCtx)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
{
conn, err := cli.Connector.Get(testCtx, addr)
@ -66,7 +66,7 @@ func TestRpc2ReadFrame(t *testing.T) {
frame.Write([]byte{0x1, 0x00, 0x00, 0x00, 0xee})
conn.WriteFrame(frame)
_, err = conn.ReadFrame(testCtx)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
}

4
blobstore/common/rpc2/checksum_test.go
View File

@ -178,7 +178,7 @@ func TestEncodeDecodeBodyBase(t *testing.T) {
require.Equal(t, block.EncodeSize(int64(size)), nn, logName)
require.Equal(t, clientBody.rhasher.Sum32(), serverBody.whasher.Sum32(), logName)
_, err = decodeBody.WriteTo(serverBody)
require.ErrorIs(t, io.EOF, err, logName)
require.ErrorIs(t, err, io.EOF, logName)
} else {
b := make([]byte, size)
n, err := io.ReadFull(decodeBody, b)
@ -187,7 +187,7 @@ func TestEncodeDecodeBodyBase(t *testing.T) {
serverBody.Write(b)
require.Equal(t, clientBody.rhasher.Sum32(), serverBody.whasher.Sum32(), logName)
_, err = decodeBody.Read(make([]byte, 1))
require.ErrorIs(t, io.EOF, err, logName)
require.ErrorIs(t, err, io.EOF, logName)
}
decodeBody.Close()
}

6
blobstore/common/rpc2/connector_test.go
View File

@ -125,7 +125,7 @@ func TestConnectorLimited(t *testing.T) {
stream, err := c.Get(testCtx, addr)
require.NoError(t, err)
_, err = c.Get(testCtx, addr)
require.ErrorIs(t, ErrConnLimited, err)
require.ErrorIs(t, err, ErrConnLimited)
c.Put(testCtx, stream, false)
stream1, err := c.Get(testCtx, addr)
@ -190,12 +190,12 @@ func TestConnectorWaitTimeout(t *testing.T) {
stream, err := c.Get(testCtx, addr)
require.NoError(t, err)
_, err = c.Get(testCtx, addr)
require.ErrorIs(t, ErrConnLimited, err)
require.ErrorIs(t, err, ErrConnLimited)
deadCtx, cancel := context.WithTimeout(testCtx, 100*time.Millisecond)
defer cancel()
_, err = c.Get(deadCtx, addr)
require.ErrorIs(t, context.DeadlineExceeded, err)
require.ErrorIs(t, err, context.DeadlineExceeded)
c.Put(testCtx, stream, false)
}

2
blobstore/common/rpc2/header_test.go
View File

@ -130,5 +130,5 @@ func TestRpc2FixedHeaderReader(t *testing.T) {
Trailer: &header,
}
_, err := r.Read(nil)
require.ErrorIs(t, errLimitedWrite, err)
require.ErrorIs(t, err, errLimitedWrite)
}

8
blobstore/common/rpc2/request_test.go
View File

@ -50,21 +50,21 @@ func TestRequestTimeout(t *testing.T) {
require.NoError(t, err)
req = req.WithContext(context.Background())
err = cli.DoWith(req, nil)
require.ErrorIs(t, transport.ErrTimeout, err)
require.ErrorIs(t, err, transport.ErrTimeout)
cli.RequestTimeout.Duration = 0
ctx, cancel := context.WithTimeout(testCtx, 100*time.Millisecond)
req, err = NewRequest(ctx, server.Name, "/", nil, nil)
require.NoError(t, err)
err = cli.DoWith(req, nil)
require.ErrorIs(t, transport.ErrTimeout, err)
require.Error(t, err)
cancel()
cli.Timeout.Duration = 200 * time.Millisecond
req, err = NewRequest(testCtx, server.Name, "/", nil, nil)
require.NoError(t, err)
err = cli.DoWith(req, nil)
require.ErrorIs(t, transport.ErrTimeout, err)
require.ErrorIs(t, err, transport.ErrTimeout)
cli.Timeout.Duration = 0
buff := make([]byte, 8<<20)
@ -130,7 +130,7 @@ func TestRequestErrors(t *testing.T) {
req.OptionCrcDownload()
require.NoError(t, err)
err = cli.DoWith(req, nil)
require.ErrorIs(t, ErrFrameHeader, err)
require.ErrorIs(t, err, ErrFrameHeader)
}
func handleBodyReadable(w ResponseWriter, req *Request) error {

6
blobstore/common/rpc2/rpc2_test.go
View File

@ -299,7 +299,7 @@ func TestRpc2CodecReader(t *testing.T) {
require.NoError(t, err)
require.Equal(t, 1, n)
_, err = r.Read(buff)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
{
buff := make([]byte, size)
@ -308,7 +308,7 @@ func TestRpc2CodecReader(t *testing.T) {
require.NoError(t, err)
require.Equal(t, size, n)
_, err = r.Read(buff)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
{
buff := make([]byte, size+1)
@ -317,7 +317,7 @@ func TestRpc2CodecReader(t *testing.T) {
require.NoError(t, err)
require.Equal(t, size, n)
_, err = r.Read(buff)
require.ErrorIs(t, io.EOF, err)
require.ErrorIs(t, err, io.EOF)
}
{
req.Parameter = make([]byte, _maxCodecerSize)

4
blobstore/proxy/cacher/disk_test.go
View File

@ -64,9 +64,9 @@ func TestProxyCacherDiskError(t *testing.T) {
_, err := c.GetDisk(context.Background(), &proxy.CacheDiskArgs{DiskID: 1})
require.Error(t, err)
_, err = c.GetDisk(context.Background(), &proxy.CacheDiskArgs{DiskID: 2, Flush: true})
require.ErrorIs(t, errcode.ErrCMDiskNotFound, err)
require.ErrorIs(t, err, errcode.ErrCMDiskNotFound)
_, err = c.GetDisk(context.Background(), &proxy.CacheDiskArgs{DiskID: 1, Flush: false})
require.ErrorIs(t, errcode.ErrCMDiskNotFound, err)
require.ErrorIs(t, err, errcode.ErrCMDiskNotFound)
}
func TestProxyCacherDiskCacheMiss(t *testing.T) {

4
blobstore/proxy/cacher/volume_test.go
View File

@ -126,9 +126,9 @@ func TestProxyCacherVolumeError(t *testing.T) {
_, err := c.GetVolume(context.Background(), &proxy.CacheVolumeArgs{Vid: 1})
require.Error(t, err)
_, err = c.GetVolume(context.Background(), &proxy.CacheVolumeArgs{Vid: 2, Flush: true})
require.ErrorIs(t, errcode.ErrVolumeNotExist, err)
require.ErrorIs(t, err, errcode.ErrVolumeNotExist)
_, err = c.GetVolume(context.Background(), &proxy.CacheVolumeArgs{Vid: 1, Flush: false})
require.ErrorIs(t, errcode.ErrVolumeNotExist, err)
require.ErrorIs(t, err, errcode.ErrVolumeNotExist)
}
func TestProxyCacherVolumeCacheMiss(t *testing.T) {

6
blobstore/scheduler/blob_deleter_test.go
View File

@ -370,7 +370,7 @@ func TestBlobDeleteConsume(t *testing.T) {
ret := delBlobRet{delMsg: msg, ctx: ctx}
mgr.consume(&ret, commonCloser)
require.Equal(t, DeleteStatusFailed, ret.status)
require.ErrorIs(t, errMock, ret.err)
require.ErrorIs(t, ret.err, errMock)
mgr.clusterTopology = oldClusterTopology
mgr.blobnodeCli = oldBlobNode
}
@ -404,7 +404,7 @@ func TestBlobDeleteConsume(t *testing.T) {
mgr.consume(&ret, commonCloser)
require.Equal(t, DeleteStatusFailed, ret.status)
require.Nil(t, msg.BlobDelStages.Stages)
require.ErrorIs(t, errcode.ErrDiskBroken, ret.err)
require.ErrorIs(t, ret.err, errcode.ErrDiskBroken)
mgr.clusterTopology = oldClusterTopology
mgr.blobnodeCli = oldBlobNode
}
@ -456,7 +456,7 @@ func TestBlobDeleteConsume(t *testing.T) {
mgr.consume(&ret, commonCloser)
require.Equal(t, DeleteStatusFailed, ret.status)
require.Nil(t, msg.BlobDelStages.Stages)
require.ErrorIs(t, errcode.ErrDiskBroken, ret.err)
require.ErrorIs(t, ret.err, errcode.ErrDiskBroken)
mgr.clusterTopology = oldClusterTopology
mgr.blobnodeCli = oldBlobNode

2
blobstore/scheduler/client/clustermgr_test.go
View File

@ -115,7 +115,7 @@ func TestClustermgrClient(t *testing.T) {
cli.client.(*MockClusterManager).EXPECT().UnlockVolume(any, any).Return(errcode.ErrUnlockNotAllow)
err = cli.UnlockVolume(ctx, 1, 0)
require.ErrorIs(t, errcode.ErrUnlockNotAllow, err)
require.ErrorIs(t, err, errcode.ErrUnlockNotAllow)
cli.client.(*MockClusterManager).EXPECT().UnlockVolume(any, any).Return(errMock)
err = cli.UnlockVolume(ctx, 1, 0)

2
blobstore/scheduler/migrate_test.go
View File

@ -620,7 +620,7 @@ func TestMigrateQueryTask(t *testing.T) {
mgr.clusterMgrCli.(*MockClusterMgrAPI).EXPECT().GetMigrateTask(any, any, any).Return(nil, errMock)
_, err := mgr.QueryTask(ctx, taskID)
require.ErrorIs(t, errMock, err)
require.ErrorIs(t, err, errMock)
t1, err := mockGenMigrateTask(proto.TaskTypeManualMigrate, "z0", 4, 100, proto.MigrateStateInited, MockMigrateVolInfoMap).ToTask()
require.NoError(t, err)

6
blobstore/scheduler/shard_repairer_test.go
View File

@ -149,7 +149,7 @@ func TestConsumerShardRepairMsg(t *testing.T) {
mgr.blobnodeCli = blobnode
ret := mgr.consume(ctx, msg, commonCloser)
require.Equal(t, ShardRepairStatusFailed, ret.status)
require.ErrorIs(t, errMock, ret.err)
require.ErrorIs(t, ret.err, errMock)
mgr.blobnodeCli = oldBlobnode
}
{
@ -160,7 +160,7 @@ func TestConsumerShardRepairMsg(t *testing.T) {
mgr.blobnodeCli = blobnode
ret := mgr.consume(ctx, msg, commonCloser)
require.Equal(t, ShardRepairStatusFailed, ret.status)
require.ErrorIs(t, errcode.ErrDestReplicaBad, ret.err)
require.ErrorIs(t, ret.err, errcode.ErrDestReplicaBad)
mgr.blobnodeCli = oldBlobnode
}
{
@ -171,7 +171,7 @@ func TestConsumerShardRepairMsg(t *testing.T) {
mgr.blobnodeCli = blobnode
ret := mgr.consume(ctx, msg, commonCloser)
require.Equal(t, ShardRepairStatusOrphan, ret.status)
require.ErrorIs(t, errcode.ErrOrphanShard, ret.err)
require.ErrorIs(t, ret.err, errcode.ErrOrphanShard)
mgr.blobnodeCli = oldBlobnode
}
{

8
blobstore/util/errors/error_info_test.go
View File

@ -26,9 +26,9 @@ import (
func TestErrorBase(t *testing.T) {
e := New("base")
err := Base(e, "foo.Bar failed: abc", struct{ float float64 }{3.14})
require.ErrorIs(t, e, Cause(err))
require.ErrorIs(t, e, err.Cause())
require.ErrorIs(t, e, err.Unwrap())
require.ErrorIs(t, Cause(err), e)
require.ErrorIs(t, err.Cause(), e)
require.ErrorIs(t, err.Unwrap(), e)
msg := err.Details()
t.Log(msg)
@ -37,7 +37,7 @@ func TestErrorBase(t *testing.T) {
// Detail with base error
err.Detail(New("basex"))
require.NotErrorIs(t, e, err.Unwrap())
require.NotErrorIs(t, err.Unwrap(), e)
msg = err.Details()
t.Log(msg)
end = "base ~ foo.Bar failed: abc {float:3.14} --> basex"

6
blobstore/util/limit/count/count_test.go
View File

@ -37,13 +37,13 @@ func TestCountLimit(t *testing.T) {
require.NoError(t, l.Acquire(key))
require.NoError(t, l.Acquire(key))
require.ErrorIs(t, limit.ErrLimited, l.Acquire(key))
require.ErrorIs(t, l.Acquire(key), limit.ErrLimited)
require.Equal(t, 2, l.Running())
l.Release(key)
require.Equal(t, 1, l.Running())
require.NoError(t, l.Acquire(key))
require.ErrorIs(t, limit.ErrLimited, l.Acquire(key))
require.ErrorIs(t, l.Acquire(key), limit.ErrLimited)
require.Equal(t, 2, l.Running())
l.Release(key)
@ -51,7 +51,7 @@ func TestCountLimit(t *testing.T) {
require.Equal(t, 0, l.Running())
require.NoError(t, l.Acquire(key))
require.NoError(t, l.Acquire(key))
require.ErrorIs(t, limit.ErrLimited, l.Acquire(key))
require.ErrorIs(t, l.Acquire(key), limit.ErrLimited)
require.Equal(t, 2, l.Running())
}

14
blobstore/util/retry/retry_test.go
View File

@ -132,14 +132,14 @@ func TestRetryContext(t *testing.T) {
err := retry.Timed(10, 0).OnContext(ctx, func() error {
return errTestOnly
})
require.ErrorIs(t, errTestOnly, err)
require.ErrorIs(t, err, errTestOnly)
}
{
ctx, cancel := context.WithCancel(context.Background())
err := retry.Timed(10, 0).OnContext(ctx, func() error {
return errTestOnly
})
require.ErrorIs(t, errTestOnly, err)
require.ErrorIs(t, err, errTestOnly)
cancel()
}
{
@ -150,7 +150,7 @@ func TestRetryContext(t *testing.T) {
return errTestOnly
})
require.Equal(t, 3, called) // 0, 400, 800
require.ErrorIs(t, errTestOnly, err)
require.ErrorIs(t, err, errTestOnly)
cancel()
}
{
@ -161,7 +161,7 @@ func TestRetryContext(t *testing.T) {
return false, errTestOnly
})
require.Equal(t, 3, called) // 0, 300, 900
require.ErrorIs(t, errTestOnly, err)
require.ErrorIs(t, err, errTestOnly)
cancel()
}
}
@ -184,7 +184,7 @@ func TestRetryInterrupted(t *testing.T) {
})
duration := time.Since(st)
require.ErrorIs(t, errTestInterrupt, err)
require.ErrorIs(t, err, errTestInterrupt)
require.Equal(t, 2, called)
v := int64(duration / time.Millisecond)
require.Less(t, int64(380), v, "duration: ", v)
@ -206,7 +206,7 @@ func TestRetryInterruptedError(t *testing.T) {
duration := time.Since(st)
// get last error if interrupt with ErrRetryNext
require.ErrorIs(t, errTestOnly, err)
require.ErrorIs(t, err, errTestOnly)
require.Equal(t, 1, called)
v := int64(duration / time.Millisecond)
require.Less(t, int64(190), v, "duration: ", v)
@ -225,7 +225,7 @@ func TestRetryInterruptedError(t *testing.T) {
duration = time.Since(st)
// ignored the ErrRetryNext
require.ErrorIs(t, nil, err)
require.NoError(t, err)
require.Equal(t, 1, called)
v = int64(duration / time.Millisecond)
require.Less(t, int64(190), v, "duration: ", v)