diff --git a/br/pkg/restore/import_mode_switcher_test.go b/br/pkg/restore/import_mode_switcher_test.go index 41a2cc78f08e9..8b56ab4fdd511 100644 --- a/br/pkg/restore/import_mode_switcher_test.go +++ b/br/pkg/restore/import_mode_switcher_test.go @@ -16,7 +16,6 @@ package restore_test import ( "context" - "fmt" "net" "sync" "testing" @@ -50,17 +49,9 @@ func (s *mockImportServer) SwitchMode(_ context.Context, req *import_sstpb.Switc func TestRestorePreWork(t *testing.T) { ctx := context.Background() - var port int - var lis net.Listener - var err error - for port = 0; port < 1000; port += 1 { - addr := fmt.Sprintf(":%d", 51111+port) - lis, err = net.Listen("tcp", addr) - if err == nil { - break - } - t.Log(err) - } + lis, err := net.Listen("tcp", ":0") + require.NoError(t, err) + addr := lis.Addr().String() s := grpc.NewServer() ch := make(chan struct{}) @@ -77,7 +68,7 @@ func TestRestorePreWork(t *testing.T) { pdClient := split.NewFakePDClient([]*metapb.Store{ { Id: 1, - Address: fmt.Sprintf(":%d", 51111+port), + Address: addr, }, }, false, nil) pdHTTPCli := split.NewFakePDHTTPClient() diff --git a/br/pkg/restore/internal/import_client/import_client_test.go b/br/pkg/restore/internal/import_client/import_client_test.go index 5fb2d8479deac..e7471f6c1232e 100644 --- a/br/pkg/restore/internal/import_client/import_client_test.go +++ b/br/pkg/restore/internal/import_client/import_client_test.go @@ -16,7 +16,6 @@ package importclient_test import ( "context" - "fmt" "net" "sync" "testing" @@ -79,18 +78,9 @@ func (s *mockImportServer) MultiIngest(_ context.Context, req *import_sstpb.Mult func TestImportClient(t *testing.T) { ctx := context.Background() - var port int - var lis net.Listener - var err error - for port = 0; port < 1000; port += 1 { - addr := fmt.Sprintf(":%d", 51111+port) - lis, err = net.Listen("tcp", addr) - if err == nil { - break - } - t.Log(err) - } - + lis, err := net.Listen("tcp", ":0") + require.NoError(t, err) + addr := lis.Addr().String() s := grpc.NewServer() import_sstpb.RegisterImportSSTServer(s, &mockImportServer{ErrCount: 3}) @@ -102,7 +92,7 @@ func TestImportClient(t *testing.T) { require.NoError(t, err) }() - client := importclient.NewImportClient(&storeClient{addr: fmt.Sprintf(":%d", 51111+port)}, nil, keepalive.ClientParameters{}) + client := importclient.NewImportClient(&storeClient{addr: addr}, nil, keepalive.ClientParameters{}) { resp, err := client.ClearFiles(ctx, 1, &import_sstpb.ClearRequest{Prefix: "test"})