Minor changes from self review

Signed-off-by: Matt Lord <[email protected]>

go/test/endtoend/vreplication/helper_test.go

@@ -1084,6 +1084,6 @@ func isEmptyWorkflowShowOutput(output string) bool {
   "workflows": []
 }`
 	)
-
-	return strings.TrimSpace(output) == emptyJSON || strings.TrimSpace(output) == emptyNonCompactWorkflowShowResponse
+	v := strings.TrimSpace(output)
+	return v == emptyJSON || v == emptyNonCompactWorkflowShowResponse
 }

go/test/endtoend/vreplication/migrate_test.go

@@ -41,7 +41,7 @@ func insertInitialDataIntoExternalCluster(t *testing.T, conn *mysql.Conn) {
 	})
 }
 
-// TestMigrate runs an e2e test for importing from an external cluster using the vtctld Mount and Migrate commands.
+// TestMigrate runs an e2e test for importing from an external cluster using the vtctldclient Mount and Migrate commands.
 // We have an anti-pattern in Vitess: vt executables look for an environment variable VTDATAROOT for certain cluster parameters
 // like the log directory when they are created. Until this test we just needed a single cluster for e2e tests.
 // However now we need to create an external Vitess cluster. For this we need a different VTDATAROOT and

go/test/endtoend/vreplication/vreplication_test.go

@@ -1168,11 +1168,9 @@ func shardMerchant(t *testing.T) {
 }
 
 func materialize(t *testing.T, spec string) {
-	t.Run("vtctldclient materialize", func(t *testing.T) {
+	t.Run("materialize", func(t *testing.T) {
 		// Split out the parameters from the JSON spec for
 		// use in the vtctldclient command flags.
-		// This allows us to test both clients with the same
-		// input.
 		sj := gjson.Parse(spec)
 		workflow := sj.Get("workflow").String()
 		require.NotEmpty(t, workflow, "workflow not found in spec: %s", spec)