Merge #110573 #110598

110573: docs: fix typo in an RFC file name r=yuzefovich a=yuzefovich Epic: None Release note: None 110598: workload: unskip some tests against default test tenant r=yuzefovich a=yuzefovich These tests were failing because we previously skipped splits if the tenant didn't have the SCATTER capability. That was recently enabled in tests, so the tests should now work. Note that this SCATTER capability check is currently needed for acceptance tests, so it's not removed entirely. Fixes: #109458. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Sep 14, 2023 · 49573d5 · 49573d5
3 parents 0bcf071 + 47570ac + 2a3c499
commit 49573d5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/docs/RFCS/20210423_db-cosole-bazel-build.md → docs/RFCS/20210423_db-console-bazel-build.md b/docs/RFCS/20210423_db-cosole-bazel-build.md → docs/RFCS/20210423_db-console-bazel-build.md
diff --git a/pkg/workload/bank/bank_test.go b/pkg/workload/bank/bank_test.go
@@ -42,11 +42,7 @@ func TestBank(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
-		UseDatabase: `test`,
-
-		DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(109458),
-	})
+	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{UseDatabase: `test`})
 	defer srv.Stopper().Stop(ctx)
 
 	sqlutils.MakeSQLRunner(db).Exec(t, `CREATE DATABASE test`)

diff --git a/pkg/workload/insights/insights_test.go b/pkg/workload/insights/insights_test.go
@@ -43,11 +43,7 @@ func TestInsightsWorkload(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
-		UseDatabase: `test`,
-
-		DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(109458),
-	})
+	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{UseDatabase: `test`})
 	defer srv.Stopper().Stop(ctx)
 
 	sqlutils.MakeSQLRunner(db).Exec(t, `CREATE DATABASE test`)

diff --git a/pkg/workload/workloadsql/workloadsql_test.go b/pkg/workload/workloadsql/workloadsql_test.go
@@ -81,11 +81,7 @@ func TestSplits(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	ctx := context.Background()
-	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
-		UseDatabase: `test`,
-
-		DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(109458),
-	})
+	srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{UseDatabase: `test`})
 	defer srv.Stopper().Stop(ctx)
 
 	sqlDB := sqlutils.MakeSQLRunner(db)