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

Jump to bottom

*: fix flaky test TestTiDBTrx (#53932) #54940

Closed
wants to merge 1 commit into from
Closed

*: fix flaky test TestTiDBTrx (#53932) #54940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions pkg/infoschema/test/clustertablestest/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,11 @@ func TestTiDBTrx(t *testing.T) {
// `WAITING_START_TIME` will not be affected by time_zone, it is in memory and we assume that the system time zone will not change.
blockTime2.Format(types.TimeFSPFormat)+
" 0 19 10 user1 db1 [\"sql1\",\"sql2\",\""+digest.String()+"\"] "))
<<<<<<< HEAD
=======
tk.MustQuery(`select state from information_schema.tidb_trx as trx union select state from information_schema.tidb_trx as trx`).Sort().
Check(testkit.Rows(txninfo.TxnRunningStateStrs[txninfo.TxnIdle], txninfo.TxnRunningStateStrs[txninfo.TxnLockAcquiring]))
>>>>>>> ec6f56e8260 (*: fix flaky test TestTiDBTrx (#53932))

rows := tk.MustQuery(`select WAITING_TIME from information_schema.TIDB_TRX where WAITING_TIME is not null`)
require.Len(t, rows.Rows(), 1)
Expand Down