api: fix the testServiceSuite (#5096)

ref #4813 Fix the `testServiceSuite`. Signed-off-by: JmPotato <ghzpotato@gmail.com>
tikv · Jun 2, 2022 · d114cd6 · d114cd6
1 parent fc55b44
commit d114cd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 23 deletions.
diff --git a/server/api/admin_test.go b/server/api/admin_test.go
@@ -170,22 +170,3 @@ func (s *testTSOSuite) TestResetTS(c *C) {
 		tu.StringEqual(c, "\"invalid tso value\"\n"))
 	c.Assert(err, IsNil)
 }
-
-var _ = Suite(&testServiceSuite{})
-
-type testServiceSuite struct {
-	svr     *server.Server
-	cleanup cleanUpFunc
-}
-
-func (s *testServiceSuite) SetUpSuite(c *C) {
-	s.svr, s.cleanup = mustNewServer(c)
-	mustWaitLeader(c, []*server.Server{s.svr})
-
-	mustBootstrapCluster(c, s.svr)
-	mustPutStore(c, s.svr, 1, metapb.StoreState_Up, metapb.NodeState_Serving, nil)
-}
-
-func (s *testServiceSuite) TearDownSuite(c *C) {
-	s.cleanup()
-}
diff --git a/server/api/server_test.go b/server/api/server_test.go
@@ -154,22 +154,22 @@ func mustBootstrapCluster(c *C, s *server.Server) {
 	c.Assert(resp.GetHeader().GetError().GetType(), Equals, pdpb.ErrorType_OK)
 }
 
-var _ = Suite(&testServerServiceSuite{})
+var _ = Suite(&testServiceSuite{})
 
-type testServerServiceSuite struct {
+type testServiceSuite struct {
 	svr     *server.Server
 	cleanup cleanUpFunc
 }
 
-func (s *testServerServiceSuite) SetUpSuite(c *C) {
+func (s *testServiceSuite) SetUpSuite(c *C) {
 	s.svr, s.cleanup = mustNewServer(c)
 	mustWaitLeader(c, []*server.Server{s.svr})
 
 	mustBootstrapCluster(c, s.svr)
 	mustPutStore(c, s.svr, 1, metapb.StoreState_Up, metapb.NodeState_Serving, nil)
 }
 
-func (s *testServerServiceSuite) TearDownSuite(c *C) {
+func (s *testServiceSuite) TearDownSuite(c *C) {
 	s.cleanup()
 }