Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: change some tests using failpoint to serialSuite #19753

Merged
merged 5 commits into from
Sep 3, 2020
Merged

*: change some tests using failpoint to serialSuite #19753

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
674fe37
1
wjhuang2016 Sep 3, 2020
d03553a
done
wjhuang2016 Sep 3, 2020
37291fd
Merge branch 'master' of https://github.com/pingcap/tidb into fix_fp
wjhuang2016 Sep 3, 2020
dec373e
1
wjhuang2016 Sep 3, 2020
838b6ae
Merge branch 'master' into fix_fp
ti-srebot Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/pingcap/tidb into fix_fp
  • Loading branch information
@wjhuang2016
wjhuang2016 committed Sep 3, 2020
commit 37291fdc590fb80f321288558b6fe6bbba56d071
2 changes: 1 addition & 1 deletion executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,7 @@ func (s *testSerialSuite) TestBatchPointGetRepeatableRead(c *C) {
c.Assert(failpoint.Disable(step2), IsNil)
}

func (s *testSerialSuite1) TestSplitRegionTimeout(c *C) {
func (s *testSerialSuite) TestSplitRegionTimeout(c *C) {
c.Assert(failpoint.Enable("github.com/pingcap/tidb/store/tikv/MockSplitRegionTimeout", `return(true)`), IsNil)
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.