Merge #91775

91775: roachtest: add placeholder type hint r=adityamaru a=adityamaru Fixes: #91728, #91725, #91726, #91727, #91736 Release note: None Co-authored-by: adityamaru <[email protected]>
cockroachdb · Nov 14, 2022 · fed5abb · fed5abb
2 parents 7f77f57 + b124e5d
commit fed5abb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/cmd/roachtest/tests/multitenant_distsql.go b/pkg/cmd/roachtest/tests/multitenant_distsql.go
@@ -81,7 +81,7 @@ func runMultiTenantDistSQL(
 	}
 
 	storConn := c.Conn(ctx, t.L(), 1)
-	_, err := storConn.Exec(`SELECT crdb_internal.create_tenant($1)`, tenantID)
+	_, err := storConn.Exec(`SELECT crdb_internal.create_tenant($1::INT)`, tenantID)
 	require.NoError(t, err)
 
 	instances := make([]*tenantNode, 0, numInstances)

diff --git a/pkg/cmd/roachtest/tests/multitenant_upgrade.go b/pkg/cmd/roachtest/tests/multitenant_upgrade.go
@@ -87,7 +87,7 @@ func runMultiTenantUpgrade(ctx context.Context, t test.Test, c cluster.Cluster,
 	// auto-update loop (at the time of writing 30s), plus some migrations may be
 	// genuinely long-running.
 	runner.SucceedsSoonDuration = 5 * time.Minute
-	runner.Exec(t, `SELECT crdb_internal.create_tenant($1)`, tenant11ID)
+	runner.Exec(t, `SELECT crdb_internal.create_tenant($1::INT)`, tenant11ID)
 
 	var initialVersion string
 	runner.QueryRow(t, "SHOW CLUSTER SETTING version").Scan(&initialVersion)

diff --git a/pkg/cmd/roachtest/tests/smoketest_secure.go b/pkg/cmd/roachtest/tests/smoketest_secure.go
@@ -66,7 +66,7 @@ func multitenantSmokeTest(ctx context.Context, t test.Test, c cluster.Cluster) {
 	tenID := 11
 	ten := createTenantNode(ctx, t, c, c.Node(1), tenID, 2, 8011, 9011)
 	runner := sqlutils.MakeSQLRunner(c.Conn(ctx, t.L(), 1))
-	runner.Exec(t, `SELECT crdb_internal.create_tenant($1)`, tenID)
+	runner.Exec(t, `SELECT crdb_internal.create_tenant($1::INT)`, tenID)
 	ten.start(ctx, t, c, "./cockroach")
 
 	// this doesn't work yet, roachprod knows nothing about tenants