From 5c24c2cda4210ca05f89c65e3c5e108aa8cd76d2 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 9 Oct 2024 20:24:19 +0200 Subject: [PATCH] fix v15 tests Signed-off-by: Tim Vaillancourt --- go/vt/vtctl/reparentutil/emergency_reparenter_test.go | 2 +- go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go index 93ea7defc7c..1803bf9d19a 100644 --- a/go/vt/vtctl/reparentutil/emergency_reparenter_test.go +++ b/go/vt/vtctl/reparentutil/emergency_reparenter_test.go @@ -1940,7 +1940,7 @@ func TestEmergencyReparenter_reparentShardLocked(t *testing.T) { }, keyspace: "testkeyspace", shard: "-", - cells: []string{"zone1"}, + ts: memorytopo.NewServer("zone1"), shouldErr: true, errShouldContain: "primary zone1-0000000100 is not equal to expected alias zone1-0000000101", }, diff --git a/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go b/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go index 9828bb17196..20804a0b625 100644 --- a/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go +++ b/go/vt/vtctl/reparentutil/planned_reparenter_flaky_test.go @@ -3278,6 +3278,7 @@ func TestPlannedReparenter_reparentShardLocked(t *testing.T) { }, { name: "expected primary mismatch", + ts: memorytopo.NewServer("zone1"), tmc: &testutil.TabletManagerClient{}, shards: []*vtctldatapb.Shard{ { @@ -3347,7 +3348,7 @@ func TestPlannedReparenter_reparentShardLocked(t *testing.T) { }, tt.tablets...) if len(tt.shards) > 0 { - testutil.AddShards(ctx, t, ts, tt.shards...) + testutil.AddShards(ctx, t, tt.ts, tt.shards...) } if !tt.unlockTopo {