Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

pkg/mock, pkg/lightning: unify mock files (#786)#788

Merged
ti-chi-bot merged 7 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-f1daf8a4d6d1
May 6, 2021
Merged

pkg/mock, pkg/lightning: unify mock files (#786)#788
ti-chi-bot merged 7 commits into
pingcap:release-4.0from
ti-srebot:release-4.0-f1daf8a4d6d1

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Mar 3, 2021

cherry-pick #786 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In br repo:
git pr https://github.com/pingcap/br/pull/788

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/br.git pr/788:release-4.0-f1daf8a4d6d1

What problem does this PR solve?

Unify mock files of BR and Lightning.

Check List

Tests

  • Unit test
  • Integration test

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change

Related changes

  • Need to cherry-pick to the release branch

Release Note

  • No release note.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@overvenus
Copy link
Copy Markdown
Member

/run-all-tests

@glorv
Copy link
Copy Markdown
Collaborator

glorv commented Mar 4, 2021

/lgtm

@ti-srebot ti-srebot added the status/LGT1 LGTM1 label Mar 4, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@kennytm kennytm force-pushed the release-4.0-f1daf8a4d6d1 branch from a4b4e7e to 03fa063 Compare March 10, 2021 18:10
@overvenus
Copy link
Copy Markdown
Member

Test build fails @kennytm

[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:724:17: undefined: "github.com/pingcap/br/pkg/mock".NewMockBackend
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:756:17: undefined: "github.com/pingcap/br/pkg/mock".NewMockBackend
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:832:17: undefined: "github.com/pingcap/br/pkg/mock".NewMockBackend
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:837:16: undefined: "github.com/pingcap/br/pkg/mock".NewMockEngineWriter
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:872:17: undefined: "github.com/pingcap/br/pkg/mock".NewMockBackend
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:877:16: undefined: "github.com/pingcap/br/pkg/mock".NewMockEngineWriter
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:1087:16: undefined: "github.com/pingcap/br/pkg/mock".NewMockImportKVClient
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:1088:20: undefined: "github.com/pingcap/br/pkg/mock".NewMockImportKV_WriteEngineClient
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:1089:21: undefined: "github.com/pingcap/br/pkg/mock".NewMockImportKV_WriteEngineClient
[2021-03-10T18:14:09.282Z] pkg/lightning/restore/restore_test.go:1192:17: undefined: "github.com/pingcap/br/pkg/mock".NewMockBackend

@kennytm
Copy link
Copy Markdown
Collaborator

kennytm commented Mar 13, 2021

let's hold this off until the tikv-client people actually confirmed the working solution.

@kennytm
Copy link
Copy Markdown
Collaborator

kennytm commented Mar 29, 2021

(the #838 cherry-pick has been reverted.)

@kennytm
Copy link
Copy Markdown
Collaborator

kennytm commented Mar 30, 2021

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • kennytm

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels Mar 30, 2021
@glorv
Copy link
Copy Markdown
Collaborator

glorv commented Apr 7, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

This pull request has been accepted and is ready to merge.

DetailsCommit hash: a2c6ff4

@glorv
Copy link
Copy Markdown
Collaborator

glorv commented May 6, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 0c8ca98

@ti-chi-bot ti-chi-bot merged commit 39611a6 into pingcap:release-4.0 May 6, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants