fix test

Signed-off-by: Ryan Leung <[email protected]>
rleungx · Feb 4, 2024 · d28a79d · d28a79d
1 parent f24c8f1
commit d28a79d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/pkg/mcs/resourcemanager/server/apis/v1/api.go b/pkg/mcs/resourcemanager/server/apis/v1/api.go
@@ -220,7 +220,7 @@ func (s *Service) getResourceGroupList(c *gin.Context) {
 //	@Param		name	path		string	true	"Name of the resource group to be deleted"
 //	@Success	200		{string}	string	"Success!"
 //	@Failure	404		{string}	error
-//	@Router		/config/group/{name} [DELETE]
+//	@Router		/config/group/{name} [delete]
 func (s *Service) deleteResourceGroup(c *gin.Context) {
 	if err := s.manager.DeleteResourceGroup(c.Param("name")); err != nil {
 		c.String(http.StatusNotFound, err.Error())

diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go
@@ -379,7 +379,7 @@ func getOperators(c *gin.Context) {
 // @Produce  json
 // @Success  200  {string}  string  "All pending operator are canceled."
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
-// @Router   /operators [DELETE]
+// @Router   /operators [delete]
 func deleteOperators(c *gin.Context) {
 	handler := c.MustGet(handlerKey).(*handler.Handler)
 	if err := handler.RemoveOperators(); err != nil {
@@ -397,7 +397,7 @@ func deleteOperators(c *gin.Context) {
 // @Success  200  {string}  string  "The pending operator is canceled."
 // @Failure  400  {string}  string  "The input is invalid."
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
-// @Router   /operators/{region_id} [DELETE]
+// @Router   /operators/{region_id} [delete]
 func deleteOperatorByRegion(c *gin.Context) {
 	handler := c.MustGet(handlerKey).(*handler.Handler)
 	id := c.Param("id")

diff --git a/tests/server/api/operator_test.go b/tests/server/api/operator_test.go
@@ -661,21 +661,19 @@ func (suite *operatorTestSuite) checkRemoveOperators(cluster *tests.TestCluster)
 	tests.MustPutRegionInfo(re, cluster, r1)
 	r2 := core.NewTestRegionInfo(20, 1, []byte("b"), []byte("c"), core.SetWrittenBytes(2000), core.SetReadBytes(0), core.SetRegionConfVer(2), core.SetRegionVersion(3))
 	tests.MustPutRegionInfo(re, cluster, r2)
-	r3 := core.NewTestRegionInfo(30, 1, []byte("c"), []byte("d"), core.SetWrittenBytes(500), core.SetReadBytes(800), core.SetRegionConfVer(3), core.SetRegionVersion(2))
+	r3 := core.NewTestRegionInfo(30, 1, []byte("c"), []byte(""), core.SetWrittenBytes(500), core.SetReadBytes(800), core.SetRegionConfVer(3), core.SetRegionVersion(2))
 	tests.MustPutRegionInfo(re, cluster, r3)
-	r4 := core.NewTestRegionInfo(40, 1, []byte("d"), []byte(""), core.SetWrittenBytes(500), core.SetReadBytes(800), core.SetRegionConfVer(3), core.SetRegionVersion(2))
-	tests.MustPutRegionInfo(re, cluster, r4)
 
 	urlPrefix := fmt.Sprintf("%s/pd/api/v1", cluster.GetLeaderServer().GetAddr())
 	err := tu.CheckPostJSON(testDialClient, fmt.Sprintf("%s/operators", urlPrefix), []byte(`{"name":"merge-region", "source_region_id": 10, "target_region_id": 20}`), tu.StatusOK(re))
 	re.NoError(err)
-	err = tu.CheckPostJSON(testDialClient, fmt.Sprintf("%s/operators", urlPrefix), []byte(`{"name":"merge-region", "source_region_id": 30, "target_region_id": 40}`), tu.StatusOK(re))
+	err = tu.CheckPostJSON(testDialClient, fmt.Sprintf("%s/operators", urlPrefix), []byte(`{"name":"add-peer", "region_id": 30, "store_id": 3}`), tu.StatusOK(re))
 	re.NoError(err)
 	url := fmt.Sprintf("%s/operators", urlPrefix)
-	err = tu.CheckGetJSON(testDialClient, url, nil, tu.StatusOK(re), tu.StringContain(re, "merge: region 10 to 20"), tu.StringContain(re, "merge: region 30 to 40"))
+	err = tu.CheckGetJSON(testDialClient, url, nil, tu.StatusOK(re), tu.StringContain(re, "merge: region 10 to 20"), tu.StringContain(re, "add peer: store [3]"))
 	re.NoError(err)
 	err = tu.CheckDelete(testDialClient, url, tu.StatusOK(re))
 	re.NoError(err)
-	err = tu.CheckGetJSON(testDialClient, url, nil, tu.StatusOK(re), tu.StringNotContain(re, "merge: region 10 to 20"), tu.StringNotContain(re, "merge: region 30 to 40"))
+	err = tu.CheckGetJSON(testDialClient, url, nil, tu.StatusOK(re), tu.StringNotContain(re, "merge: region 10 to 20"), tu.StringNotContain(re, "add peer: store [3]"))
 	re.NoError(err)
 }