This repository has been archived by the owner on Nov 24, 2023. It is now read-only.
test: fix test isn't suitable for an unordered output (#1372) #1374
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot
added
priority/unimportant
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| @@ -93,7 +93,13 @@ func (s *testCheckerSuite) TestDumpPrivilegeChecking(c *tc.C) { | |||
| mock := s.initMockDB(c) | |||
| mock.ExpectQuery("SHOW GRANTS").WillReturnRows(sqlmock.NewRows([]string{"Grants for User"}). | |||
| AddRow("GRANT USAGE ON *.* TO 'haha'@'%'")) | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
expected statement, found '<<' (and 2 more errors)
|
will manually cherry-pick to #1371 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cherry-pick #1372 to release-2.0
You can switch your code base to this Pull Request by using git-extras:
# In dm repo: git pr 1374After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
follow up #1366
What is changed and how it works?
change to unorder match
Check List
Tests
Code changes
Side effects
Related changes