Skip to content

Commit 1cb43c5

Browse files
committed
Fix vtgate/reference test
Signed-off-by: Matt Lord <[email protected]>
1 parent 8d8b3b4 commit 1cb43c5

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

go/test/endtoend/vreplication/vstream_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ func TestMultiVStreamsKeyspaceReshard(t *testing.T) {
654654
// Confirm that we have shard GTIDs for the global shard and the old/original shards.
655655
require.Len(t, newVGTID.GetShardGtids(), 3)
656656

657+
waitForWorkflowState(t, vc, fmt.Sprintf("%s.%s", ks, wf), binlogdatapb.VReplicationWorkflowState_Running.String())
658+
657659
// Switch the traffic to the new shards.
658660
reshardAction(t, "SwitchTraffic", wf, ks, oldShards, newShards, defaultCellName, tabletType)
659661

go/test/endtoend/vtgate/queries/reference/main_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ func TestMain(m *testing.M) {
161161
"--target-keyspace", shardedKeyspaceName,
162162
"create",
163163
"--source-keyspace", unshardedKeyspaceName,
164-
"--table-settings", `'[{"target_table": "zip_detail", "source_expression": "select * from zip_detail", "create_ddl": "copy" }]'`,
164+
"--table-settings", `[{"target_table": "zip_detail", "source_expression": "select * from zip_detail", "create_ddl": "copy" }]`,
165165
"--tablet-types", "PRIMARY",
166166
)
167167
fmt.Fprintf(os.Stderr, "Output from materialize: %s\n", output)
@@ -207,8 +207,9 @@ func TestMain(m *testing.M) {
207207
err = clusterInstance.VtctldClientProcess.ExecuteCommand(
208208
"Workflow",
209209
"--keyspace", shardedKeyspaceName,
210-
"--workflow", "copy_zip_detail",
211210
"delete",
211+
"--workflow", "copy_zip_detail",
212+
"--keep-data",
212213
)
213214
if err != nil {
214215
fmt.Fprintf(os.Stderr, "Failed to stop materialization workflow: %v", err)

0 commit comments

Comments
 (0)