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(testing): move mock files to testing clustermgr

Browse Source 
. #1000145567

Signed-off-by: slasher <shenjie1@oppo.com>
This commit is contained in:
slasher 2025-05-27 14:25:33 +08:00
parent 0ab1c039a0
commit 61c2e882fb
12 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blobstore/clustermgr/catalog/applier_test.go
View File

@ -24,16 +24,16 @@ import (
"testing"
"time"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"github.com/cubefs/cubefs/blobstore/api/clustermgr"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/cluster"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/clustermgr/persistence/catalogdb"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/trace"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
)
func TestCatalogMgr_Apply(t *testing.T) {

10
blobstore/clustermgr/catalog/catalog_test.go
View File

@ -24,18 +24,18 @@ import (
"testing"
"time"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"github.com/cubefs/cubefs/blobstore/api/clustermgr"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/cluster"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/clustermgr/persistence/catalogdb"
"github.com/cubefs/cubefs/blobstore/common/codemode"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/sharding"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
)
var testConfig = Config{
@ -99,7 +99,7 @@ func initMockCatalogMgr(t testing.TB, conf Config) (*CatalogMgr, func()) {
mockRaftServer := mocks.NewMockRaftServer(ctr)
mockScopeMgr := mock.NewMockScopeMgrAPI(ctr)
mockDiskMgr := cluster.NewMockShardNodeManagerAPI(ctr)
mockSharNodeAPI := cluster.NewMockShardNodeAPI(ctr)
mockSharNodeAPI := mock.NewMockShardNodeAPI(ctr)
mockKvMgr := mock.NewMockKvMgrAPI(ctr)
mockDiskMgr.EXPECT().Stat(gomock.Any(), proto.DiskTypeNVMeSSD).AnyTimes().Return(&clustermgr.SpaceStatInfo{TotalDisk: 35})

2
blobstore/clustermgr/catalog/createshard_test.go
View File

@ -24,11 +24,11 @@ import (
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/cluster"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/common/codemode"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/raftserver"
"github.com/cubefs/cubefs/blobstore/common/trace"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
)

6
blobstore/clustermgr/cluster/alloc_test.go
View File

@ -31,11 +31,11 @@ import (
"github.com/cubefs/cubefs/blobstore/api/blobnode"
"github.com/cubefs/cubefs/blobstore/api/clustermgr"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/clustermgr/persistence/normaldb"
"github.com/cubefs/cubefs/blobstore/common/codemode"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/trace"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
"github.com/cubefs/cubefs/blobstore/util/errors"
)
@ -69,7 +69,7 @@ var (
defaultRetrySleepIntervalS time.Duration = 2
testMockScopeMgr *mock.MockScopeMgrAPI
testMockBlobNode *mocks.MockStorageAPI
testMockShardNode *MockShardNodeAPI
testMockShardNode *mock.MockShardNodeAPI
testIdcs = []string{"z0", "z1", "z2"}
hostPrefix = "test-host-"
)
@ -227,7 +227,7 @@ func initTestShardNodeMgr(t *testing.T) (d *ShardNodeManager, closeFunc func())
if err != nil {
t.Log(errors.Detail(err))
}
testMockShardNode = NewMockShardNodeAPI(ctrl)
testMockShardNode = mock.NewMockShardNodeAPI(ctrl)
testMockRaftServer := mocks.NewMockRaftServer(ctrl)
testMockRaftServer.EXPECT().Propose(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)

2
blobstore/clustermgr/configmgr/applier_test.go
View File

@ -25,8 +25,8 @@ import (
"github.com/cubefs/cubefs/blobstore/api/clustermgr"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/common/trace"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
)
func TestConfigMgr_Others(t *testing.T) {

5
blobstore/clustermgr/volumemgr/createvolume_test.go
View File

@ -19,17 +19,16 @@ import (
"errors"
"testing"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/cluster"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/common/codemode"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/raftserver"
"github.com/cubefs/cubefs/blobstore/common/trace"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
)

4
blobstore/clustermgr/volumemgr/volumemgr_test.go
View File

@ -25,7 +25,6 @@ import (
"testing"
"time"
apierrors "github.com/cubefs/cubefs/blobstore/common/errors"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
@ -33,13 +32,14 @@ import (
"github.com/cubefs/cubefs/blobstore/api/clustermgr"
"github.com/cubefs/cubefs/blobstore/clustermgr/base"
"github.com/cubefs/cubefs/blobstore/clustermgr/cluster"
"github.com/cubefs/cubefs/blobstore/clustermgr/mock"
"github.com/cubefs/cubefs/blobstore/clustermgr/persistence/normaldb"
"github.com/cubefs/cubefs/blobstore/clustermgr/persistence/volumedb"
"github.com/cubefs/cubefs/blobstore/common/codemode"
apierrors "github.com/cubefs/cubefs/blobstore/common/errors"
"github.com/cubefs/cubefs/blobstore/common/proto"
"github.com/cubefs/cubefs/blobstore/common/raftserver"
"github.com/cubefs/cubefs/blobstore/common/trace"
mock "github.com/cubefs/cubefs/blobstore/testing/mockclustermgr"
"github.com/cubefs/cubefs/blobstore/testing/mocks"
_ "github.com/cubefs/cubefs/blobstore/testing/nolog"
)

0
blobstore/clustermgr/mock/configmgr.go → blobstore/testing/mockclustermgr/configmgr.go
View File

0
blobstore/clustermgr/mock/kvmgr.go → blobstore/testing/mockclustermgr/kvmgr.go
View File

8
blobstore/clustermgr/mock/mock.go → blobstore/testing/mockclustermgr/mock.go
View File

@ -15,10 +15,10 @@
package mock
// github.com/cubefs/cubefs/blobstore/clustermgr/... module clustermgr interfaces
//go:generate mockgen -destination=../base/raftproto_mock_test.go -package=base -mock_names RaftApplier=MockRaftApplier github.com/cubefs/cubefs/blobstore/clustermgr/base RaftApplier
//go:generate mockgen -destination=../../clustermgr/base/raftproto_mock_test.go -package=base -mock_names RaftApplier=MockRaftApplier github.com/cubefs/cubefs/blobstore/clustermgr/base RaftApplier
//go:generate mockgen -destination=../../clustermgr/cluster/blobnodemgr_mock.go -package=cluster -mock_names BlobNodeManagerAPI=MockBlobNodeManagerAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster BlobNodeManagerAPI
//go:generate mockgen -destination=../../clustermgr/cluster/shardnodemgr_mock.go -package=cluster -mock_names ShardNodeManagerAPI=MockShardNodeManagerAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster ShardNodeManagerAPI
//go:generate mockgen -destination=./shardnodeapi.go -package=mock -mock_names ShardNodeAPI=MockShardNodeAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster ShardNodeAPI
//go:generate mockgen -destination=./kvmgr.go -package=mock -mock_names KvMgrAPI=MockKvMgrAPI github.com/cubefs/cubefs/blobstore/clustermgr/kvmgr KvMgrAPI
//go:generate mockgen -destination=./configmgr.go -package=mock -mock_names ConfigMgrAPI=MockConfigMgrAPI github.com/cubefs/cubefs/blobstore/clustermgr/configmgr ConfigMgrAPI
//go:generate mockgen -destination=./scopemgr.go -package=mock -mock_names ScopeMgrAPI=MockScopeMgrAPI github.com/cubefs/cubefs/blobstore/clustermgr/scopemgr ScopeMgrAPI
//go:generate mockgen -destination=../cluster/blobnodemgr_mock.go -package=cluster -mock_names BlobNodeManagerAPI=MockBlobNodeManagerAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster BlobNodeManagerAPI
//go:generate mockgen -destination=../cluster/shardnodemgr_mock.go -package=cluster -mock_names ShardNodeManagerAPI=MockShardNodeManagerAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster ShardNodeManagerAPI
//go:generate mockgen -destination=../cluster/shardnodeapi_mock.go -package=cluster -mock_names ShardNodeAPI=MockShardNodeAPI github.com/cubefs/cubefs/blobstore/clustermgr/cluster ShardNodeAPI

0
blobstore/clustermgr/mock/scopemgr.go → blobstore/testing/mockclustermgr/scopemgr.go
View File

4
blobstore/clustermgr/cluster/shardnodeapi_mock.go → blobstore/testing/mockclustermgr/shardnodeapi.go
View File

@ -1,8 +1,8 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/cubefs/cubefs/blobstore/clustermgr/cluster (interfaces: ShardNodeAPI)
// Package cluster is a generated GoMock package.
package cluster
// Package mock is a generated GoMock package.
package mock
import (
context "context"