Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@crelax
crelax committed Jun 29, 2022
1 parent 743eac1 commit 792faf7
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 30 deletions.
72 changes: 42 additions & 30 deletions cdc/api/v2/changefeed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ func TestCreateChangefeed(t *testing.T) {
require.Nil(t, err)

w := httptest.NewRecorder()
req, _ := http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(body))
req, _ := http.NewRequestWithContext(context.Background(), create.method,
create.url, bytes.NewReader(body))
router.ServeHTTP(w, req)
require.Equal(t, 201, w.Code)

Expand All @@ -112,7 +113,8 @@ func TestCreateChangefeed(t *testing.T) {
CreateChangefeedInfo(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
Return(cerrors.ErrPDEtcdAPIError).Times(1)
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(body))
req, _ = http.NewRequestWithContext(context.Background(), create.method,
create.url, bytes.NewReader(body))
router.ServeHTTP(w, req)
respErr := model.HTTPError{}
err = json.NewDecoder(w.Body).Decode(&respErr)
Expand All @@ -139,7 +141,8 @@ func TestCreateChangefeed(t *testing.T) {
require.Nil(t, err)

w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(body1))
req, _ = http.NewRequestWithContext(context.Background(), create.method,
create.url, bytes.NewReader(body1))
router.ServeHTTP(w, req)
respErr = model.HTTPError{}
err = json.NewDecoder(w.Body).Decode(&respErr)
Expand All @@ -148,16 +151,22 @@ func TestCreateChangefeed(t *testing.T) {
require.Equal(t, http.StatusBadRequest, w.Code)

// case 4: failed to create TiStore
helpers.EXPECT().callKVCreateTiStore(gomock.Any(), gomock.Any()).Return(nil, cerrors.ErrNewStore)
helpers.EXPECT().
callKVCreateTiStore(gomock.Any(), gomock.Any()).
Return(nil, cerrors.ErrNewStore)
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(body))
req, _ = http.NewRequestWithContext(context.Background(), create.method,
create.url, bytes.NewReader(body))
router.ServeHTTP(w, req)
require.NotEqual(t, http.StatusOK, w.Code)

// case 5: failed to connect to pd
helpers.EXPECT().getPDClient(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, cerrors.ErrAPIGetPDClientFailed)
helpers.EXPECT().
getPDClient(gomock.Any(), gomock.Any(), gomock.Any()).
Return(nil, cerrors.ErrAPIGetPDClientFailed)
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(body))
req, _ = http.NewRequestWithContext(context.Background(), create.method,
create.url, bytes.NewReader(body))
router.ServeHTTP(w, req)
require.Equal(t, http.StatusBadRequest, w.Code)

Expand All @@ -174,7 +183,8 @@ func TestCreateChangefeed(t *testing.T) {
bodyErr, err := json.Marshal(&configErr)
require.Nil(t, err)
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(), create.method, create.url, bytes.NewReader(bodyErr))
req, _ = http.NewRequestWithContext(context.Background(),
create.method, create.url, bytes.NewReader(bodyErr))
router.ServeHTTP(w, req)
require.Equal(t, http.StatusBadRequest, w.Code)
}
Expand All @@ -193,10 +203,10 @@ func TestUpdateChangefeed(t *testing.T) {
cp.EXPECT().IsOwner().Return(true).AnyTimes()

// case 1 invalid id
invalidId := "#Invalid_"
invalidID := "#Invalid_"
w := httptest.NewRecorder()
req, _ := http.NewRequestWithContext(context.Background(), update.method,
fmt.Sprintf(update.url, invalidId), nil)
fmt.Sprintf(update.url, invalidID), nil)
router.ServeHTTP(w, req)
respErr := model.HTTPError{}
err := json.NewDecoder(w.Body).Decode(&respErr)
Expand Down Expand Up @@ -253,7 +263,7 @@ func TestUpdateChangefeed(t *testing.T) {
respErr = model.HTTPError{}
err = json.NewDecoder(w.Body).Decode(&respErr)
require.Nil(t, err)
require.Contains(t, respErr.Code, "ErrUpstreamNotFound") //todo: should be a bad request?
require.Contains(t, respErr.Code, "ErrUpstreamNotFound")
require.Equal(t, http.StatusInternalServerError, w.Code)

// case 5: json failed
Expand Down Expand Up @@ -287,7 +297,7 @@ func TestUpdateChangefeed(t *testing.T) {
respErr = model.HTTPError{}
err = json.NewDecoder(w.Body).Decode(&respErr)
require.Nil(t, err)
require.Contains(t, respErr.Code, "ErrUpstreamMissMatch") //todo: should be a bad request?
require.Contains(t, respErr.Code, "ErrUpstreamMissMatch")
require.Equal(t, http.StatusInternalServerError, w.Code)

// case 6: verify update changefeed info failed
Expand Down Expand Up @@ -369,13 +379,13 @@ func TestGetChangeFeedMetaInfo(t *testing.T) {
// fmt.Sprintf("/api/v2/changefeeds/%s/meta_info", invalidID)

// validId but not exists
validId := "changefeed-valid-id"
statusProvider.err = cerrors.ErrChangeFeedNotExists.GenWithStackByArgs(validId)
validID := "changefeed-valid-id"
statusProvider.err = cerrors.ErrChangeFeedNotExists.GenWithStackByArgs(validID)
cp.EXPECT().StatusProvider().Return(statusProvider).AnyTimes()

w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(),
metaInfo.method, fmt.Sprintf(metaInfo.url, validId), nil)
metaInfo.method, fmt.Sprintf(metaInfo.url, validID), nil)
router.ServeHTTP(w, req)
require.Equal(t, http.StatusBadRequest, w.Code)
respErr = model.HTTPError{}
Expand All @@ -385,34 +395,34 @@ func TestGetChangeFeedMetaInfo(t *testing.T) {

// valid but changefeed contains runtime error
statusProvider.err = nil
statusProvider.changefeedInfo =
&model.ChangeFeedInfo{
ID: validId,
Error: &model.RunningError{
Code: string(cerrors.ErrGCTTLExceeded.RFCCode())},
}
statusProvider.changefeedInfo = &model.ChangeFeedInfo{
ID: validID,
Error: &model.RunningError{
Code: string(cerrors.ErrGCTTLExceeded.RFCCode()),
},
}
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(),
metaInfo.method, fmt.Sprintf(metaInfo.url, validId), nil)
metaInfo.method, fmt.Sprintf(metaInfo.url, validID), nil)
router.ServeHTTP(w, req)
require.Equal(t, http.StatusOK, w.Code)
resp := ChangeFeedInfo{}
err = json.NewDecoder(w.Body).Decode(&resp)
require.Nil(t, err)
require.Equal(t, resp.ID, validId)
require.Equal(t, resp.ID, validID)
require.Contains(t, resp.Error.Code, "ErrGCTTLExceeded")

// success
statusProvider.changefeedInfo = &model.ChangeFeedInfo{ID: validId}
statusProvider.changefeedInfo = &model.ChangeFeedInfo{ID: validID}
w = httptest.NewRecorder()
req, _ = http.NewRequestWithContext(context.Background(),
metaInfo.method, fmt.Sprintf(metaInfo.url, validId), nil)
metaInfo.method, fmt.Sprintf(metaInfo.url, validID), nil)
router.ServeHTTP(w, req)
require.Equal(t, http.StatusOK, w.Code)
resp = ChangeFeedInfo{}
err = json.NewDecoder(w.Body).Decode(&resp)
require.Nil(t, err)
require.Equal(t, resp.ID, validId)
require.Equal(t, resp.ID, validID)
require.Nil(t, resp.Error)
}

Expand All @@ -425,8 +435,8 @@ func TestVerifyTable(t *testing.T) {
upManager := upstream.NewManager4Test(pdClient)
helpers := NewMockAPIV2Helpers(gomock.NewController(t))
cp := mock_capture.NewMockInfoForAPI(gomock.NewController(t))
//statusProvider := &mockStatusProvider{}
//cp.EXPECT().StatusProvider().Return(statusProvider).AnyTimes()
// statusProvider := &mockStatusProvider{}
// cp.EXPECT().StatusProvider().Return(statusProvider).AnyTimes()
cp.EXPECT().GetUpstreamManager().Return(upManager).AnyTimes()
cp.EXPECT().IsOwner().Return(true).AnyTimes()
cp.EXPECT().IsReady().Return(true).AnyTimes()
Expand Down Expand Up @@ -483,9 +493,11 @@ func TestVerifyTable(t *testing.T) {
// case 4: success
eligible := []model.TableName{
{Schema: "test", Table: "validTable1"},
{Schema: "test", Table: "validTable2"}}
{Schema: "test", Table: "validTable2"},
}
ineligible := []model.TableName{
{Schema: "test", Table: "invalidTable"}}
{Schema: "test", Table: "invalidTable"},
}
helpers.EXPECT().callEntryVerifTables(gomock.Any(), gomock.Any(), gomock.Any()).
Return(eligible, ineligible, nil)

Expand Down
5 changes: 5 additions & 0 deletions errors.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# AUTOGENERATED BY github.com/pingcap/errors/errdoc-gen
# YOU CAN CHANGE THE 'description'/'workaround' FIELDS IF THEM ARE IMPROPER.

["CDC:ErrAPIGetPDClientFailed"]
error = '''
failed to get PDClient to connect PD, please recheck
'''

["CDC:ErrAPIInvalidParam"]
error = '''
invalid api parameter
Expand Down

0 comments on commit 792faf7

Please sign in to comment.