fix v15 tests

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Oct 9, 2024 · 5c24c2c · 5c24c2c
1 parent 48ae3d8
commit 5c24c2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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 {