From 3ed17b00021a25689bf6b67647c079c4ee484542 Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Mon, 4 Mar 2024 23:30:56 -0500 Subject: [PATCH] Nitty test improvements Signed-off-by: Matt Lord --- go/test/endtoend/vreplication/vstream_test.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/go/test/endtoend/vreplication/vstream_test.go b/go/test/endtoend/vreplication/vstream_test.go index 59a21bd0836..e13c3e24e80 100644 --- a/go/test/endtoend/vreplication/vstream_test.go +++ b/go/test/endtoend/vreplication/vstream_test.go @@ -619,11 +619,10 @@ func TestMultiVStreamsKeyspaceReshard(t *testing.T) { case "-80", "80-": oldShardRowEvents++ case "0": + // We expect some for the sequence backing table, but don't care. default: require.FailNow(t, fmt.Sprintf("received event for unexpected shard: %s", shard)) } - case binlogdatapb.VEventType_JOURNAL: - require.FailNow(t, fmt.Sprintf("received unexpected journal event for keyspace: %s", ev.GetKeyspace())) case binlogdatapb.VEventType_VGTID: newVGTID = ev.GetVgtid() if len(newVGTID.GetShardGtids()) == 3 { @@ -642,7 +641,6 @@ func TestMultiVStreamsKeyspaceReshard(t *testing.T) { } default: require.FailNow(t, fmt.Sprintf("VStream returned unexpected error: %v", err)) - return } select { case <-streamCtx.Done(): @@ -678,17 +676,14 @@ func TestMultiVStreamsKeyspaceReshard(t *testing.T) { case "-40", "40-80", "80-c0", "c0-": newShardRowEvents++ case "0": + // Again, we expect some for the sequence backing table, but don't care. default: require.FailNow(t, fmt.Sprintf("received event for unexpected shard: %s", shard)) } } } - case io.EOF: - log.Infof("Stream Ended") - streamCancel() default: - log.Errorf("Returned err %v", err) - streamCancel() + require.FailNow(t, fmt.Sprintf("VStream returned unexpected error: %v", err)) } select { case <-done: