diff --git a/go/test/endtoend/cluster/vtctlclient_process.go b/go/test/endtoend/cluster/vtctlclient_process.go index 94aa2b7651a..8be59625903 100644 --- a/go/test/endtoend/cluster/vtctlclient_process.go +++ b/go/test/endtoend/cluster/vtctlclient_process.go @@ -66,20 +66,13 @@ func (vtctlclient *VtctlClientProcess) ApplyVSchema(Keyspace string, JSON string // ExecuteCommand executes any vtctlclient command func (vtctlclient *VtctlClientProcess) ExecuteCommand(args ...string) (err error) { - pArgs := []string{"-server", vtctlclient.Server} - - if *isCoverage { - pArgs = append(pArgs, "-test.coverprofile="+getCoveragePath("vtctlclient-"+args[0]+".out"), "-test.v") - } - pArgs = append(pArgs, args...) - tmpProcess := exec.Command( - vtctlclient.Binary, - pArgs..., - ) - log.Infof("Executing vtctlclient with command: %v", strings.Join(tmpProcess.Args, " ")) - output, err := tmpProcess.Output() - if err != nil { - log.Errorf("Error executing %s: output %s, err %v", strings.Join(tmpProcess.Args, " "), output, err) + output, err := vtctlclient.ExecuteCommandWithOutput(args...) + if output != "" { + if err != nil { + log.Errorf("Output:\n%v", output) + } else { + log.Infof("Output:\n%v", output) + } } return err } diff --git a/go/test/endtoend/sharding/base_sharding.go b/go/test/endtoend/sharding/base_sharding.go index 8b4ca934892..05a58435f48 100644 --- a/go/test/endtoend/sharding/base_sharding.go +++ b/go/test/endtoend/sharding/base_sharding.go @@ -328,14 +328,6 @@ func checkLots(t *testing.T, vttablet cluster.Vttablet, count uint64, table stri return float64(float64(totalFound) * 100 / float64(count) / 2) } -// CheckRunningBinlogPlayer Checks binlog player is running and showing in status -func CheckRunningBinlogPlayer(t *testing.T, vttablet cluster.Vttablet, numberOfQueries int, numberOfTxns int) { - status := vttablet.VttabletProcess.GetStatus() - assert.Contains(t, status, "VReplication state: Open") - assert.Contains(t, status, fmt.Sprintf("