Add helper func for empty show output

Signed-off-by: Matt Lord <[email protected]>
vitessio · Dec 28, 2024 · 52f708c · 52f708c
1 parent d8dd893
commit 52f708c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/go/test/endtoend/vreplication/helper_test.go b/go/test/endtoend/vreplication/helper_test.go
@@ -348,7 +348,7 @@ func waitForWorkflowToBeCreated(t *testing.T, vc *VitessCluster, ksWorkflow stri
 	keyspace, workflow := parseKeyspaceWorkflow(t, ksWorkflow)
 	require.NoError(t, waitForCondition("workflow to be created", func() bool {
 		output, err := vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", keyspace, "show", "--workflow", workflow, "--compact", "--include-logs=false")
-		return err == nil && output != emptyWorkflowShowResponse
+		return err == nil && isEmptyWorkflowShowOutput(output)
 	}, defaultTimeout))
 }
 
@@ -1058,3 +1058,15 @@ func parseKeyspaceWorkflow(t *testing.T, ksWorkflow string) (string, string) {
 	require.True(t, ok, "invalid <keyspace>.<workflow> value: %s", ksWorkflow)
 	return keyspace, workflow
 }
+
+func isEmptyWorkflowShowOutput(output string) bool {
+	const (
+		emptyJSON                           = `{}`
+		emptyNonCompactWorkflowShowResponse = `{
+  "workflows": []
+}
+`
+	)
+
+	return output == emptyJSON || output == emptyNonCompactWorkflowShowResponse
+}
diff --git a/go/test/endtoend/vreplication/partial_movetables_seq_test.go b/go/test/endtoend/vreplication/partial_movetables_seq_test.go
@@ -38,11 +38,6 @@ import (
 	As part of a separate cleanup we will build on this framework to replace the existing one.
 */
 
-const emptyWorkflowShowResponse = `{
-  "workflows": []
-}
-`
-
 type keyspace struct {
 	name    string
 	vschema string
@@ -505,13 +500,13 @@ func TestPartialMoveTablesWithSequences(t *testing.T) {
 
 			output, err := tc.vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", reverseKs, "show", "--workflow", reverseWf)
 			require.NoError(t, err)
-			require.Equal(t, emptyWorkflowShowResponse, output)
+			require.True(t, isEmptyWorkflowShowOutput(output))
 
 			// Be sure that we've deleted the original workflow.
 			_, _ = tc.vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", targetKs, "delete", "--workflow", wf)
 			output, err = tc.vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", targetKs, "show", "--workflow", wf)
 			require.NoError(t, err)
-			require.Equal(t, emptyWorkflowShowResponse, output)
+			require.True(t, isEmptyWorkflowShowOutput(output))
 		}
 
 		// Confirm that the global routing rules are now gone.

diff --git a/go/test/endtoend/vreplication/partial_movetables_test.go b/go/test/endtoend/vreplication/partial_movetables_test.go
@@ -365,13 +365,13 @@ func testPartialMoveTablesBasic(t *testing.T, flavor workflowFlavor) {
 
 		output, err := vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", reverseKs, "show", "--workflow", reverseWf, "--shards", opts.shardSubset)
 		require.NoError(t, err)
-		require.Equal(t, emptyWorkflowShowResponse, output)
+		require.True(t, isEmptyWorkflowShowOutput(output))
 
 		// Be sure we've deleted the original workflow.
 		_, _ = vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", targetKs, "delete", "--workflow", wf, "--shards", opts.shardSubset)
 		output, err = vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", targetKs, "show", "--workflow", wf, "--shards", opts.shardSubset)
 		require.NoError(t, err, output)
-		require.Equal(t, emptyWorkflowShowResponse, output)
+		require.True(t, isEmptyWorkflowShowOutput(output))
 	}
 
 	// Confirm that the global routing rules are now gone.