Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workload: enable tenant testing for allccl_test #138915

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

workload: enable tenant testing for allccl_test #138915

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions pkg/ccl/workloadccl/allccl/all_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ func TestAllRegisteredImportFixture(t *testing.T) {

ctx := context.Background()
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
// The test tenant needs to be disabled for this test until
// we address #75449.
DefaultTestTenant: base.TODOTestTenantDisabled,
UseDatabase: "d",
SQLMemoryPoolSize: sqlMemoryPoolSize,
})
Expand Down Expand Up @@ -149,14 +146,13 @@ func TestAllRegisteredSetup(t *testing.T) {
defer log.Scope(t).Close(t)
ctx := context.Background()
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
// Need to disable the test tenant here until we resolve
// #75449 as this test makes use of import through a fixture.
DefaultTestTenant: base.TODOTestTenantDisabled,
UseDatabase: "d",
UseDatabase: "d",
})
defer s.Stopper().Stop(ctx)
sqlutils.MakeSQLRunner(db).Exec(t, `CREATE DATABASE d`)
sqlutils.MakeSQLRunner(db).Exec(t, `SET CLUSTER SETTING kv.range_merge.queue.enabled = false`)

systemDB := sqlutils.MakeSQLRunner(s.SystemLayer().SQLConn(t))
systemDB.Exec(t, `SET CLUSTER SETTING kv.range_merge.queue.enabled = false`)

var l workloadsql.InsertsDataLoader
if _, err := workloadsql.Setup(ctx, db, gen, l); err != nil {
Expand Down
Loading