Skip to content

Commit 4617172

Browse files
committed
add util func for keyspace.workflow
Signed-off-by: Matt Lord <mattalord@gmail.com>
1 parent ef46b1b commit 4617172

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

go/test/endtoend/vreplication/helper_test.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,7 @@ func assertQueryDoesNotExecutesOnTablet(t *testing.T, conn *mysql.Conn, tablet *
345345
}
346346

347347
func waitForWorkflowToBeCreated(t *testing.T, vc *VitessCluster, ksWorkflow string) {
348-
keyspace, workflow, ok := strings.Cut(ksWorkflow, ".")
349-
require.True(t, ok, "invalid <keyspace>.<workflow> value: %s", ksWorkflow)
348+
keyspace, workflow := parseKeyspaceWorkflow(t, ksWorkflow)
350349
require.NoError(t, waitForCondition("workflow to be created", func() bool {
351350
output, err := vc.VtctldClient.ExecuteCommandWithOutput("Workflow", "--keyspace", keyspace, "show", "--workflow", workflow, "--compact", "--include-logs=false")
352351
return err == nil && output != emptyWorkflowShowResponse
@@ -359,8 +358,7 @@ func waitForWorkflowToBeCreated(t *testing.T, vc *VitessCluster, ksWorkflow stri
359358
// additional stream sub-state such as "message==for vdiff".
360359
// Invalid checks are ignored.
361360
func waitForWorkflowState(t *testing.T, vc *VitessCluster, ksWorkflow string, wantState string, fieldEqualityChecks ...string) {
362-
keyspace, workflow, ok := strings.Cut(ksWorkflow, ".")
363-
require.True(t, ok, "invalid <keyspace>.<workflow> value: %s", ksWorkflow)
361+
keyspace, workflow := parseKeyspaceWorkflow(t, ksWorkflow)
364362
done := false
365363
timer := time.NewTimer(workflowStateTimeout)
366364
log.Infof("Waiting for workflow %q to fully reach %q state", ksWorkflow, wantState)
@@ -1053,3 +1051,10 @@ func validateOverrides(t *testing.T, tabs map[string]*cluster.VttabletProcess, w
10531051
}
10541052
}
10551053
}
1054+
1055+
func parseKeyspaceWorkflow(t *testing.T, ksWorkflow string) (string, string) {
1056+
t.Helper()
1057+
keyspace, workflow, ok := strings.Cut(ksWorkflow, ".")
1058+
require.True(t, ok, "invalid <keyspace>.<workflow> value: %s", ksWorkflow)
1059+
return keyspace, workflow
1060+
}

0 commit comments

Comments
 (0)