@@ -21,9 +21,9 @@ import (
21
21
22
22
"github.com/pingcap/failpoint"
23
23
"github.com/pingcap/kvproto/pkg/metapb"
24
- "github.com/pingcap/kvproto/pkg/pdpb"
25
24
"github.com/stretchr/testify/require"
26
25
"github.com/tikv/pd/pkg/core"
26
+ "github.com/tikv/pd/pkg/mock/mockserver"
27
27
"github.com/tikv/pd/pkg/storage"
28
28
"github.com/tikv/pd/pkg/utils/grpcutil"
29
29
"google.golang.org/grpc/codes"
@@ -37,11 +37,13 @@ func TestLoadRegion(t *testing.T) {
37
37
rs , err := storage .NewRegionStorageWithLevelDBBackend (context .Background (), tempDir , nil )
38
38
re .NoError (err )
39
39
40
- server := & mockServer {
41
- ctx : context .Background (),
42
- storage : storage .NewCoreStorage (storage .NewStorageWithMemoryBackend (), rs ),
43
- bc : core .NewBasicCluster (),
44
- }
40
+ server := mockserver .NewMockServer (
41
+ context .Background (),
42
+ nil ,
43
+ nil ,
44
+ storage .NewCoreStorage (storage .NewStorageWithMemoryBackend (), rs ),
45
+ core .NewBasicCluster (),
46
+ )
45
47
for i := 0 ; i < 30 ; i ++ {
46
48
rs .SaveRegion (& metapb.Region {Id : uint64 (i ) + 1 })
47
49
}
@@ -64,11 +66,13 @@ func TestErrorCode(t *testing.T) {
64
66
tempDir := t .TempDir ()
65
67
rs , err := storage .NewRegionStorageWithLevelDBBackend (context .Background (), tempDir , nil )
66
68
re .NoError (err )
67
- server := & mockServer {
68
- ctx : context .Background (),
69
- storage : storage .NewCoreStorage (storage .NewStorageWithMemoryBackend (), rs ),
70
- bc : core .NewBasicCluster (),
71
- }
69
+ server := mockserver .NewMockServer (
70
+ context .Background (),
71
+ nil ,
72
+ nil ,
73
+ storage .NewCoreStorage (storage .NewStorageWithMemoryBackend (), rs ),
74
+ core .NewBasicCluster (),
75
+ )
72
76
ctx , cancel := context .WithCancel (context .TODO ())
73
77
rc := NewRegionSyncer (server )
74
78
conn , err := grpcutil .GetClientConn (ctx , "http://127.0.0.1" , nil )
@@ -79,46 +83,3 @@ func TestErrorCode(t *testing.T) {
79
83
re .True (ok )
80
84
re .Equal (codes .Canceled , ev .Code ())
81
85
}
82
-
83
- type mockServer struct {
84
- ctx context.Context
85
- member , leader * pdpb.Member
86
- storage storage.Storage
87
- bc * core.BasicCluster
88
- }
89
-
90
- func (s * mockServer ) LoopContext () context.Context {
91
- return s .ctx
92
- }
93
-
94
- func (s * mockServer ) ClusterID () uint64 {
95
- return 1
96
- }
97
-
98
- func (s * mockServer ) GetMemberInfo () * pdpb.Member {
99
- return s .member
100
- }
101
-
102
- func (s * mockServer ) GetLeader () * pdpb.Member {
103
- return s .leader
104
- }
105
-
106
- func (s * mockServer ) GetStorage () storage.Storage {
107
- return s .storage
108
- }
109
-
110
- func (s * mockServer ) Name () string {
111
- return "mock-server"
112
- }
113
-
114
- func (s * mockServer ) GetRegions () []* core.RegionInfo {
115
- return s .bc .GetRegions ()
116
- }
117
-
118
- func (s * mockServer ) GetTLSConfig () * grpcutil.TLSConfig {
119
- return & grpcutil.TLSConfig {}
120
- }
121
-
122
- func (s * mockServer ) GetBasicCluster () * core.BasicCluster {
123
- return s .bc
124
- }
0 commit comments