cherry pick pingcap#36468 to release-6.2

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jul 22, 2022 · b1f03a0 · b1f03a0
1 parent 08e450c
commit b1f03a0
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/server/tidb_test.go b/server/tidb_test.go
@@ -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)