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

br: fix register_test failed error for flaky test #46991

Merged
merged 8 commits into from
Feb 7, 2024
Merged

br: fix register_test failed error for flaky test #46991

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1253b0e
debug test
Leavrth Sep 14, 2023
b8878e7
add the time record
Leavrth Sep 14, 2023
a9e1614
bazel prepare
Leavrth Sep 14, 2023
d336d22
debug test
Leavrth Sep 14, 2023
1257399
add the time record
Leavrth Sep 14, 2023
3b1a582
bazel prepare
Leavrth Sep 14, 2023
48df6be
fix flaky test
Leavrth Feb 7, 2024
62611ca
Merge branch 'fix_flaky_register_test' of github.com:Leavrth/tidb int…
Leavrth Feb 7, 2024
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
17 changes: 13 additions & 4 deletions br/pkg/utils/register_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package utils

import (
"context"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -115,8 +116,12 @@ func TestTaskRegisterFailedGrant(t *testing.T) {
t.Log(task.MessageToUser())
require.Equal(t, "/tidb/brie/import/restore/test", task.Key)
}

require.NoError(t, register.Close(ctx))
require.True(t, len(list.Tasks) > 0)
err = register.Close(ctx)
// for flaky test, the lease would expire
if err != nil && !strings.Contains(err.Error(), "requested lease not found") {
require.NoError(t, err)
}
}

func TestTaskRegisterFailedReput(t *testing.T) {
Expand Down Expand Up @@ -153,6 +158,10 @@ func TestTaskRegisterFailedReput(t *testing.T) {
t.Log(task.MessageToUser())
require.Equal(t, "/tidb/brie/import/restore/test", task.Key)
}

require.NoError(t, register.Close(ctx))
require.True(t, len(list.Tasks) > 0)
err = register.Close(ctx)
// for flaky test, the lease would expire
if err != nil && !strings.Contains(err.Error(), "requested lease not found") {
require.NoError(t, err)
}
}
Loading