Skip to content

executor: fix TestPrevStmtDesensitization#20680

Merged
ti-srebot merged 5 commits intopingcap:masterfrom
SunRunAway:logredact-fix-test
Oct 28, 2020
Merged

executor: fix TestPrevStmtDesensitization#20680
ti-srebot merged 5 commits intopingcap:masterfrom
SunRunAway:logredact-fix-test

Conversation

@SunRunAway
Copy link
Contributor

@SunRunAway SunRunAway commented Oct 27, 2020 •
edited
Loading

What problem does this PR solve?

Fix the test case


[2020-10-27T09:43:51.039Z] ----------------------------------------------------------------------

[2020-10-27T09:43:51.039Z] FAIL: union_scan_test.go:162: testSuite7.TestUnionScanForMemBufferReader

[2020-10-27T09:43:51.039Z] 

[2020-10-27T09:43:51.039Z] union_scan_test.go:215:

[2020-10-27T09:43:51.039Z]     c.Assert(err.Error(), Equals, "[kv:1062]Duplicate entry '2' for key 'idx'")

[2020-10-27T09:43:51.039Z] ... obtained string = "[kv:1062]Duplicate entry '?' for key '?'"

[2020-10-27T09:43:51.039Z] ... expected string = "[kv:1062]Duplicate entry '2' for key 'idx'"

[2020-10-27T09:43:51.039Z] 

[2020-10-27T09:43:51.039Z] PASS: executor_test.go:2908: testSuite.TestSelectForUpdate	0.059s

[2020-10-27T09:43:51.039Z] 

[2020-10-27T09:43:51.039Z] ----------------------------------------------------------------------

Problem Summary:

What is changed and how it works?

Proposal: xxx

What's Changed:

How it Works:

Check List

Tests

  • Unit test

Release note

  • No release note

@SunRunAway SunRunAway requested a review from a team as a code owner October 27, 2020 10:59
@SunRunAway SunRunAway requested review from XuHuaiyu and removed request for a team October 27, 2020 10:59
ichn-hu
ichn-hu approved these changes Oct 27, 2020
View reviewed changes
Copy link
Contributor

@ichn-hu ichn-hu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 27, 2020
crazycs520
crazycs520 reviewed Oct 27, 2020
View reviewed changes
Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Oct 27, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Oct 27, 2020
@SunRunAway
Copy link
Contributor Author

SunRunAway commented Oct 27, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 27, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 27, 2020

Your auto merge job has been accepted, waiting for:

  • 20584

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 27, 2020

/run-all-tests

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 27, 2020

@SunRunAway merge failed.

@SunRunAway
Copy link
Contributor Author

SunRunAway commented Oct 28, 2020

/merge

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 28, 2020

/run-all-tests

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 28, 2020

@SunRunAway merge failed.

@qw4990
Copy link
Contributor

qw4990 commented Oct 28, 2020

/merge

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 28, 2020

Your auto merge job has been accepted, waiting for:

  • 20232

@ti-srebot
Copy link
Contributor

ti-srebot commented Oct 28, 2020

/run-all-tests

@ti-srebot ti-srebot merged commit fd85234 into pingcap:master Oct 28, 2020
@SunRunAway SunRunAway mentioned this pull request Nov 24, 2020
Merged
@SunRunAway SunRunAway deleted the logredact-fix-test branch November 24, 2020 11:47
@SunRunAway
Copy link
Contributor Author

SunRunAway commented Nov 24, 2020

This PR's cherry-pick has been incorporated into #21245.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazycs520 crazycs520 crazycs520 approved these changes

@ichn-hu ichn-hu ichn-hu approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

Assignees

No one assigned

Labels

component/executor component/test sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@SunRunAway @ti-srebot @qw4990 @crazycs520 @ichn-hu