From ebe210a8ebac81e40eb5152a247ba44a9a53abaa Mon Sep 17 00:00:00 2001 From: Rameez Sajwani Date: Thu, 23 Mar 2023 17:04:56 -0700 Subject: [PATCH] fix fullstatus test for backward compat (#12685) Signed-off-by: Rameez Sajwani --- .../endtoend/reparent/plannedreparent/reparent_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/go/test/endtoend/reparent/plannedreparent/reparent_test.go b/go/test/endtoend/reparent/plannedreparent/reparent_test.go index de7e6a0368b..ba8e17eb4d2 100644 --- a/go/test/endtoend/reparent/plannedreparent/reparent_test.go +++ b/go/test/endtoend/reparent/plannedreparent/reparent_test.go @@ -418,7 +418,8 @@ func TestFullStatus(t *testing.T) { primaryStatusString, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("GetFullStatus", primaryTablet.Alias) require.NoError(t, err) primaryStatus := &replicationdatapb.FullStatus{} - err = protojson.Unmarshal([]byte(primaryStatusString), primaryStatus) + opt := protojson.UnmarshalOptions{DiscardUnknown: true} + err = opt.Unmarshal([]byte(primaryStatusString), primaryStatus) require.NoError(t, err) assert.NotEmpty(t, primaryStatus.ServerUuid) assert.NotEmpty(t, primaryStatus.ServerId) @@ -450,7 +451,8 @@ func TestFullStatus(t *testing.T) { replicaStatusString, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("GetFullStatus", replicaTablet.Alias) require.NoError(t, err) replicaStatus := &replicationdatapb.FullStatus{} - err = protojson.Unmarshal([]byte(replicaStatusString), replicaStatus) + opt = protojson.UnmarshalOptions{DiscardUnknown: true} + err = opt.Unmarshal([]byte(replicaStatusString), replicaStatus) require.NoError(t, err) assert.NotEmpty(t, replicaStatus.ServerUuid) assert.NotEmpty(t, replicaStatus.ServerId) @@ -499,7 +501,8 @@ func getFullStatus(t *testing.T, clusterInstance *cluster.LocalProcessCluster, t statusString, err := clusterInstance.VtctldClientProcess.ExecuteCommandWithOutput("GetFullStatus", tablet.Alias) require.NoError(t, err) status := &replicationdatapb.FullStatus{} - err = protojson.Unmarshal([]byte(statusString), status) + opt := protojson.UnmarshalOptions{DiscardUnknown: true} + err = opt.Unmarshal([]byte(statusString), status) require.NoError(t, err) return status }