From 61c2e882fb75e9feeb1ab26002dfd47df39ef8a5 Mon Sep 17 00:00:00 2001 From: slasher Date: Tue, 27 May 2025 14:25:33 +0800 Subject: [PATCH] chore(testing): move mock files to testing clustermgr . #1000145567 Signed-off-by: slasher --- blobstore/clustermgr/catalog/applier_test.go | 8 ++++---- blobstore/clustermgr/catalog/catalog_test.go | 10 +++++----- blobstore/clustermgr/catalog/createshard_test.go | 2 +- blobstore/clustermgr/cluster/alloc_test.go | 6 +++--- blobstore/clustermgr/configmgr/applier_test.go | 2 +- blobstore/clustermgr/volumemgr/createvolume_test.go | 5 ++--- blobstore/clustermgr/volumemgr/volumemgr_test.go | 4 ++-- .../mock => testing/mockclustermgr}/configmgr.go | 0 .../mock => testing/mockclustermgr}/kvmgr.go | 0 .../mock => testing/mockclustermgr}/mock.go | 8 ++++---- .../mock => testing/mockclustermgr}/scopemgr.go | 0 .../mockclustermgr/shardnodeapi.go} | 4 ++-- 12 files changed, 24 insertions(+), 25 deletions(-) rename blobstore/{clustermgr/mock => testing/mockclustermgr}/configmgr.go (100%) rename blobstore/{clustermgr/mock => testing/mockclustermgr}/kvmgr.go (100%) rename blobstore/{clustermgr/mock => testing/mockclustermgr}/mock.go (59%) rename blobstore/{clustermgr/mock => testing/mockclustermgr}/scopemgr.go (100%) rename blobstore/{clustermgr/cluster/shardnodeapi_mock.go => testing/mockclustermgr/shardnodeapi.go} (97%) diff --git a/blobstore/clustermgr/catalog/applier_test.go b/blobstore/clustermgr/catalog/applier_test.go index 6a86d5551..06173aa58 100644 --- a/blobstore/clustermgr/catalog/applier_test.go +++ b/blobstore/clustermgr/catalog/applier_test.go @@ -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) { diff --git a/blobstore/clustermgr/catalog/catalog_test.go b/blobstore/clustermgr/catalog/catalog_test.go index 2f0ed49af..a746ec29e 100644 --- a/blobstore/clustermgr/catalog/catalog_test.go +++ b/blobstore/clustermgr/catalog/catalog_test.go @@ -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}) diff --git a/blobstore/clustermgr/catalog/createshard_test.go b/blobstore/clustermgr/catalog/createshard_test.go index b3167d8e5..d68fb9dfe 100644 --- a/blobstore/clustermgr/catalog/createshard_test.go +++ b/blobstore/clustermgr/catalog/createshard_test.go @@ -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" ) diff --git a/blobstore/clustermgr/cluster/alloc_test.go b/blobstore/clustermgr/cluster/alloc_test.go index b1520b585..36f6254b2 100644 --- a/blobstore/clustermgr/cluster/alloc_test.go +++ b/blobstore/clustermgr/cluster/alloc_test.go @@ -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) diff --git a/blobstore/clustermgr/configmgr/applier_test.go b/blobstore/clustermgr/configmgr/applier_test.go index 5dbf91222..7e33241d2 100644 --- a/blobstore/clustermgr/configmgr/applier_test.go +++ b/blobstore/clustermgr/configmgr/applier_test.go @@ -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) { diff --git a/blobstore/clustermgr/volumemgr/createvolume_test.go b/blobstore/clustermgr/volumemgr/createvolume_test.go index 25cf57dcc..83f9ed7e5 100644 --- a/blobstore/clustermgr/volumemgr/createvolume_test.go +++ b/blobstore/clustermgr/volumemgr/createvolume_test.go @@ -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" ) diff --git a/blobstore/clustermgr/volumemgr/volumemgr_test.go b/blobstore/clustermgr/volumemgr/volumemgr_test.go index 1a73a99b1..bd3e42127 100644 --- a/blobstore/clustermgr/volumemgr/volumemgr_test.go +++ b/blobstore/clustermgr/volumemgr/volumemgr_test.go @@ -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" ) diff --git a/blobstore/clustermgr/mock/configmgr.go b/blobstore/testing/mockclustermgr/configmgr.go similarity index 100% rename from blobstore/clustermgr/mock/configmgr.go rename to blobstore/testing/mockclustermgr/configmgr.go diff --git a/blobstore/clustermgr/mock/kvmgr.go b/blobstore/testing/mockclustermgr/kvmgr.go similarity index 100% rename from blobstore/clustermgr/mock/kvmgr.go rename to blobstore/testing/mockclustermgr/kvmgr.go diff --git a/blobstore/clustermgr/mock/mock.go b/blobstore/testing/mockclustermgr/mock.go similarity index 59% rename from blobstore/clustermgr/mock/mock.go rename to blobstore/testing/mockclustermgr/mock.go index 5380323f8..2de1cc5a3 100644 --- a/blobstore/clustermgr/mock/mock.go +++ b/blobstore/testing/mockclustermgr/mock.go @@ -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 diff --git a/blobstore/clustermgr/mock/scopemgr.go b/blobstore/testing/mockclustermgr/scopemgr.go similarity index 100% rename from blobstore/clustermgr/mock/scopemgr.go rename to blobstore/testing/mockclustermgr/scopemgr.go diff --git a/blobstore/clustermgr/cluster/shardnodeapi_mock.go b/blobstore/testing/mockclustermgr/shardnodeapi.go similarity index 97% rename from blobstore/clustermgr/cluster/shardnodeapi_mock.go rename to blobstore/testing/mockclustermgr/shardnodeapi.go index a01a9e45b..9233133aa 100644 --- a/blobstore/clustermgr/cluster/shardnodeapi_mock.go +++ b/blobstore/testing/mockclustermgr/shardnodeapi.go @@ -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"