chore(testing): move mocks of iopool to testing

@formatter:off

Signed-off-by: slasher <shenjie1@oppo.com>
This commit is contained in:
slasher 2025-03-18 10:39:28 +08:00 committed by 梁曟風
parent 7653850560
commit 5c6586357c
9 changed files with 16 additions and 12 deletions

0
blobstore/Dockerfile Executable file → Normal file
View File

View File

@ -22,6 +22,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
"github.com/cubefs/cubefs/blobstore/util/log"
"github.com/cubefs/cubefs/blobstore/util/mergetask"
"github.com/cubefs/cubefs/blobstore/util/taskpool"
@ -49,7 +50,7 @@ func TestBlobFile_Op(t *testing.T) {
syncWorker := mergetask.NewMergeTask(-1, func(interface{}) error { return nil })
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).Do(func(args taskpool.IoPoolTaskArgs) {
args.TaskFn()
}).AnyTimes()

View File

@ -34,6 +34,7 @@ import (
"github.com/cubefs/cubefs/blobstore/blobnode/db"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/trace"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
_ "github.com/cubefs/cubefs/blobstore/testing/nolog"
"github.com/cubefs/cubefs/blobstore/util/log"
"github.com/cubefs/cubefs/blobstore/util/taskpool"
@ -45,7 +46,7 @@ const (
func newIoPoolMock(t *testing.T) taskpool.IoPool {
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).Do(func(args taskpool.IoPoolTaskArgs) { args.TaskFn() }).AnyTimes()
return ioPool
@ -85,7 +86,7 @@ func TestNewChunkStorage(t *testing.T) {
Status: bnapi.ChunkStatusNormal,
}
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).AnyTimes()
ioQos, _ := qos.NewIoQueueQos(qos.Config{ReadQueueDepth: 2, WriteQueueDepth: 2, WriteChanQueCnt: 2})

View File

@ -36,6 +36,7 @@ import (
"github.com/cubefs/cubefs/blobstore/blobnode/db"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/trace"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
"github.com/cubefs/cubefs/blobstore/util/taskpool"
)
@ -180,7 +181,7 @@ func createTestChunk(t *testing.T, ctx context.Context, diskRoot string, vuid pr
},
}
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).Do(func(args taskpool.IoPoolTaskArgs) { args.TaskFn() }).AnyTimes()
ioQos, _ := qos.NewIoQueueQos(qos.Config{ReadQueueDepth: 200, WriteQueueDepth: 200, WriteChanQueCnt: 2})
defer ioQos.Close()

View File

@ -31,8 +31,8 @@ import (
db2 "github.com/cubefs/cubefs/blobstore/blobnode/db"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/trace"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
"github.com/cubefs/cubefs/blobstore/util/log"
"github.com/cubefs/cubefs/blobstore/util/taskpool"
)
func TestDiskStorage_StartCompact(t *testing.T) {
@ -80,7 +80,7 @@ func TestDiskStorage_StartCompact(t *testing.T) {
}
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).AnyTimes()
srcChunkStorage, err := chunk.NewChunkStorage(ctx, dataPath, vm, ioPool, ioPool, func(option *core.Option) {
option.Conf = conf

View File

@ -33,6 +33,7 @@ import (
"github.com/cubefs/cubefs/blobstore/blobnode/core"
"github.com/cubefs/cubefs/blobstore/common/crc32block"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
_ "github.com/cubefs/cubefs/blobstore/testing/nolog"
"github.com/cubefs/cubefs/blobstore/util/log"
"github.com/cubefs/cubefs/blobstore/util/taskpool"
@ -44,7 +45,7 @@ const (
func newIoPoolMock(t *testing.T) taskpool.IoPool {
ctr := gomock.NewController(t)
ioPool := taskpool.NewMockIoPool(ctr)
ioPool := mocks.NewMockIoPool(ctr)
ioPool.EXPECT().Submit(gomock.Any()).Do(func(args taskpool.IoPoolTaskArgs) { args.TaskFn() }).AnyTimes()
return ioPool

View File

@ -17,6 +17,7 @@ package testing
// github.com/cubefs/cubefs/blobstore/util/... util interfaces
//go:generate mockgen -destination=./mocks/util_selector.go -package=mocks -mock_names Selector=MockSelector github.com/cubefs/cubefs/blobstore/util/selector Selector
//go:generate mockgen -destination=./mocks/util_iopool.go -package=mocks -mock_names IoPool=MockIoPool github.com/cubefs/cubefs/blobstore/util/taskpool IoPool
// github.com/cubefs/cubefs/blobstore/common/... common interfaces
//go:generate mockgen -destination=./mocks/common_raftserver.go -package=mocks -mock_names RaftServer=MockRaftServer github.com/cubefs/cubefs/blobstore/common/raftserver RaftServer

View File

@ -1,12 +1,13 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/cubefs/cubefs/blobstore/util/taskpool (interfaces: IoPool)
// Package taskpool is a generated GoMock package.
package taskpool
// Package mocks is a generated GoMock package.
package mocks
import (
reflect "reflect"
taskpool "github.com/cubefs/cubefs/blobstore/util/taskpool"
gomock "github.com/golang/mock/gomock"
)
@ -46,7 +47,7 @@ func (mr *MockIoPoolMockRecorder) Close() *gomock.Call {
}
// Submit mocks base method.
func (m *MockIoPool) Submit(arg0 IoPoolTaskArgs) {
func (m *MockIoPool) Submit(arg0 taskpool.IoPoolTaskArgs) {
m.ctrl.T.Helper()
m.ctrl.Call(m, "Submit", arg0)
}

View File

@ -11,8 +11,6 @@ import (
"github.com/cubefs/cubefs/blobstore/blobnode/sys"
)
//go:generate mockgen -destination=./iopool_mock.go -package=taskpool -mock_names IoPool=MockIoPool github.com/cubefs/cubefs/blobstore/util/taskpool IoPool
func TestIoPoolSimple(t *testing.T) {
metricConf := IoPoolMetricConf{
ClusterID: 1,