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

extension: fix unstable test TestExtensionConnEvent #39294

Merged
merged 3 commits into from
Nov 21, 2022
Merged

extension: fix unstable test TestExtensionConnEvent #39294

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c271e6
extension: fix unstable test `TestExtensionConnEvent`
lcwangchao Nov 21, 2022
27de795
Merge branch 'master' into fix_39281
hawkingrei Nov 21, 2022
a5718ae
Merge branch 'master' into fix_39281
hawkingrei Nov 21, 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
10 changes: 7 additions & 3 deletions server/tidb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,11 +2781,11 @@ func (l *connEventLogs) check(fn func()) {
fn()
}

func (l *connEventLogs) waitConnDisconnected() error {
func (l *connEventLogs) waitEvent(tp extension.ConnEventTp) error {
totalSleep := 0
for {
l.Lock()
if l.types[len(l.types)-1] == extension.ConnDisconnected {
if l.types[len(l.types)-1] == tp {
l.Unlock()
return nil
}
Expand All @@ -2812,6 +2812,8 @@ func TestExtensionConnEvent(t *testing.T) {
require.NoError(t, extension.Setup())

ts := createTidbTestSuite(t)
// createTidbTestSuite create an inner connection, so wait the previous connection closed
require.NoError(t, logs.waitEvent(extension.ConnDisconnected))

// test for login success
logs.reset()
Expand All @@ -2828,6 +2830,7 @@ func TestExtensionConnEvent(t *testing.T) {
}()

var expectedConn2 variable.ConnectionInfo
require.NoError(t, logs.waitEvent(extension.ConnHandshakeAccepted))
logs.check(func() {
require.Equal(t, []extension.ConnEventTp{
extension.ConnConnected,
Expand Down Expand Up @@ -2861,7 +2864,7 @@ func TestExtensionConnEvent(t *testing.T) {

require.NoError(t, conn.Close())
require.NoError(t, db.Close())
require.NoError(t, logs.waitConnDisconnected())
require.NoError(t, logs.waitEvent(extension.ConnDisconnected))
logs.check(func() {
require.Equal(t, 3, len(logs.infos))
require.Equal(t, 1, len(logs.infos[2].ActiveRoles))
Expand Down Expand Up @@ -2889,6 +2892,7 @@ func TestExtensionConnEvent(t *testing.T) {

_, err = db.Conn(context.Background())
require.Error(t, err)
require.NoError(t, logs.waitEvent(extension.ConnDisconnected))
logs.check(func() {
require.Equal(t, []extension.ConnEventTp{
extension.ConnConnected,
Expand Down