From e36e4b75144b570dd08532b579b9780ad688c5e4 Mon Sep 17 00:00:00 2001 From: Andrew Mason Date: Sat, 12 Jun 2021 11:43:00 -0400 Subject: [PATCH] [vtctldserver] Update tests to prevent races during tmclient init Signed-off-by: Andrew Mason --- go/vt/vtctl/grpcvtctldserver/server_test.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go index 3fb15bf0f10..3db13543e1f 100644 --- a/go/vt/vtctl/grpcvtctldserver/server_test.go +++ b/go/vt/vtctl/grpcvtctldserver/server_test.go @@ -1328,7 +1328,9 @@ func TestDeleteCellsAlias(t *testing.T) { require.NoError(t, err, "test setup failed") } - vtctld := NewVtctldServer(tt.ts) + vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, tt.ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer { + return NewVtctldServer(ts) + }) _, err := vtctld.DeleteCellsAlias(ctx, tt.req) if tt.shouldErr { assert.Error(t, err) @@ -2719,6 +2721,8 @@ func TestFindAllShardsInKeyspace(t *testing.T) { } func TestGetBackups(t *testing.T) { + t.Parallel() + ctx := context.Background() ts := memorytopo.NewServer() vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer { @@ -3003,7 +3007,9 @@ func TestGetRoutingRules(t *testing.T) { factory.SetError(errors.New("topo down for testing")) } - vtctld := NewVtctldServer(ts) + vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer { + return NewVtctldServer(ts) + }) resp, err := vtctld.GetRoutingRules(ctx, &vtctldatapb.GetRoutingRulesRequest{}) if tt.shouldErr { assert.Error(t, err) @@ -4515,7 +4521,9 @@ func TestRebuildVSchemaGraph(t *testing.T) { factory.SetError(errors.New("topo down for testing")) } - vtctld := NewVtctldServer(ts) + vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, nil, func(ts *topo.Server) vtctlservicepb.VtctldServer { + return NewVtctldServer(ts) + }) _, err := vtctld.RebuildVSchemaGraph(ctx, req) if tt.shouldErr { assert.Error(t, err)