From f964e01ec666a57b0f648933c9b3eec01c281dfb Mon Sep 17 00:00:00 2001 From: Andrew Mason Date: Wed, 9 Jun 2021 15:51:02 -0400 Subject: [PATCH] Use shared testing helper which guards against races in tmclient construction Fixes #8299 Signed-off-by: Andrew Mason --- go/vt/vtctl/grpcvtctldserver/server_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go index 21a2fa21805..3fb15bf0f10 100644 --- a/go/vt/vtctl/grpcvtctldserver/server_test.go +++ b/go/vt/vtctl/grpcvtctldserver/server_test.go @@ -304,7 +304,9 @@ func TestApplyRoutingRules(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.ApplyRoutingRules(ctx, tt.req) if tt.shouldErr { assert.Error(t, err)