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

test: stabilize TestTopSQLCPUProfile (#36468) #36483

Merged
merged 2 commits into from
Jul 26, 2022
Merged

test: stabilize TestTopSQLCPUProfile (#36468) #36483

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1f03a0
cherry pick #36468 to release-6.2
tangenta Jul 22, 2022
caaf91d
Merge branch 'release-6.2' into release-6.2-4c74ab4cf0de
ti-chi-bot Jul 26, 2022
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
3 changes: 0 additions & 3 deletions server/tidb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,10 +1412,7 @@ func TestTopSQLCPUProfile(t *testing.T) {
dbt.MustExec("create table t2 (a int auto_increment, b int, unique index idx(a));")
dbt.MustExec("set @@global.tidb_txn_mode = 'pessimistic'")

timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second*20)
defer cancel()
checkFn := func(sql, planRegexp string) {
require.NoError(t, timeoutCtx.Err())
stats := mc.GetSQLStatsBySQLWithRetry(sql, len(planRegexp) > 0)
// since 1 sql may has many plan, check `len(stats) > 0` instead of `len(stats) == 1`.
require.Greaterf(t, len(stats), 0, "sql: "+sql)
Expand Down