Any test that needs a VtctldServer needs to override the protocol to …

…the fake Signed-off-by: Andrew Mason <[email protected]>
vitessio · Jan 22, 2021 · 3ee391b · 3ee391b
1 parent da1437c
commit 3ee391b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/go/vt/vtadmin/api_test.go b/go/vt/vtadmin/api_test.go
@@ -39,13 +39,18 @@ import (
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver"
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver/testutil"
 	"vitess.io/vitess/go/vt/vtctl/vtctldclient"
+	"vitess.io/vitess/go/vt/vttablet/tmclient"
 
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	vtadminpb "vitess.io/vitess/go/vt/proto/vtadmin"
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
 	"vitess.io/vitess/go/vt/proto/vttime"
 )
 
+func init() {
+	*tmclient.TabletManagerProtocol = testutil.TabletManagerClientProtocol
+}
+
 func TestGetGates(t *testing.T) {
 	fakedisco1 := fakediscovery.New()
 	cluster1 := &cluster.Cluster{

diff --git a/go/vt/vtctl/grpcvtctldserver/server_test.go b/go/vt/vtctl/grpcvtctldserver/server_test.go
@@ -39,6 +39,10 @@ import (
 	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
 )
 
+func init() {
+	*tmclient.TabletManagerProtocol = testutil.TabletManagerClientProtocol
+}
+
 func TestFindAllShardsInKeyspace(t *testing.T) {
 	ctx := context.Background()
 	ts := memorytopo.NewServer("cell1")
@@ -264,7 +268,6 @@ func TestGetTablet(t *testing.T) {
 }
 
 func TestGetSchema(t *testing.T) {
-	*tmclient.TabletManagerProtocol = testutil.TabletManagerClientProtocol
 	ctx := context.Background()
 	ts := memorytopo.NewServer("zone1")
 	vtctld := NewVtctldServer(ts)