Update e2e tests: don't specify multi_tenant_spec in source vschema

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
vitessio · Mar 27, 2024 · 6be1943 · 6be1943
1 parent 7e2e1c8
commit 6be1943
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/go/test/endtoend/vreplication/multi_tenant_test.go b/go/test/endtoend/vreplication/multi_tenant_test.go
@@ -99,6 +99,14 @@ const (
     "t1": {}
   }
 }
+`
+	stSchema  = mtSchema
+	stVSchema = `
+{
+  "tables": {
+    "t1": {}
+  }
+}
 `
 )
 
@@ -123,7 +131,7 @@ func TestMultiTenantSimple(t *testing.T) {
 	tenantId := int64(1)
 	sourceKeyspace := getSourceKeyspace(tenantId)
 	sourceAliasKeyspace := getSourceAliasKeyspace(tenantId)
-	_, err = vc.AddKeyspace(t, []*Cell{vc.Cells["zone1"]}, sourceKeyspace, "0", mtVSchema, mtSchema, 1, 0, getInitialTabletIdForTenant(tenantId), nil)
+	_, err = vc.AddKeyspace(t, []*Cell{vc.Cells["zone1"]}, sourceKeyspace, "0", stVSchema, stSchema, 1, 0, getInitialTabletIdForTenant(tenantId), nil)
 	require.NoError(t, err)
 
 	targetPrimary := vc.getPrimaryTablet(t, targetKeyspace, "0")
@@ -291,6 +299,7 @@ func TestMultiTenantComplex(t *testing.T) {
 		totalRowsInserted := totalRowsInsertedPerTenant * numTenants
 		totalActualRowsInserted := getRowCount(t, vtgateConn, fmt.Sprintf("%s.%s", mtm.targetKeyspace, "t1"))
 		require.Equal(t, totalRowsInserted, totalActualRowsInserted)
+		log.Infof("Migration completed, total rows inserted in target: %d", totalActualRowsInserted)
 	})
 }
 
@@ -365,7 +374,7 @@ func (mtm *multiTenantMigration) setup(tenantId int64) {
 	mtm.setLastID(tenantId, 0)
 	sourceKeyspace := getSourceKeyspace(tenantId)
 	sourceAliasKeyspace := getSourceAliasKeyspace(tenantId)
-	_, err := vc.AddKeyspace(mtm.t, []*Cell{vc.Cells["zone1"]}, sourceKeyspace, "0", mtVSchema, mtSchema,
+	_, err := vc.AddKeyspace(mtm.t, []*Cell{vc.Cells["zone1"]}, sourceKeyspace, "0", stVSchema, stSchema,
 		1, 0, getInitialTabletIdForTenant(tenantId), nil)
 	require.NoError(mtm.t, err)
 	mtm.initTenantData(mtm.t, tenantId, sourceAliasKeyspace)