Skip to content

Commit d773874

Browse files
craig[bot]knz
craig[bot]
and
knz
committed
Merge #110008
110008: *: improve some tests r=stevendanna,yuzefovich,abargainier a=knz This PR contains the test improvements prerequisite to #110001. Epic: CRDB-18499 Co-authored-by: Raphael 'kena' Poss <[email protected]>
2 parents b5836a5 + e3461bc commit d773874

File tree

63 files changed

+533
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+533
-308
lines changed

‎pkg/ccl/cloudccl/amazon/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_test(
2323
"//pkg/testutils/serverutils",
2424
"//pkg/testutils/skip",
2525
"//pkg/testutils/sqlutils",
26-
"//pkg/testutils/testcluster",
2726
"//pkg/util/leaktest",
2827
"//pkg/util/log",
2928
"//pkg/util/randutil",

‎pkg/ccl/cloudccl/amazon/main_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/cockroachdb/cockroach/pkg/security/securitytest"
1818
"github.com/cockroachdb/cockroach/pkg/server"
1919
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
20-
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2120
"github.com/cockroachdb/cockroach/pkg/util/randutil"
2221
)
2322

@@ -27,7 +26,6 @@ func TestMain(m *testing.M) {
2726
securityassets.SetLoader(securitytest.EmbeddedAssets)
2827
randutil.SeedForTests()
2928
serverutils.InitTestServerFactory(server.TestServerFactory)
30-
serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
3129
os.Exit(m.Run())
3230
}
3331

‎pkg/ccl/cloudccl/amazon/s3_connection_test.go‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"github.com/cockroachdb/cockroach/pkg/cloud/cloudtestutils"
2626
_ "github.com/cockroachdb/cockroach/pkg/cloud/externalconn/providers" // import External Connection providers.
2727
"github.com/cockroachdb/cockroach/pkg/testutils"
28+
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
2829
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2930
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
30-
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
3131
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
3232
"github.com/cockroachdb/cockroach/pkg/util/log"
3333
)
@@ -39,14 +39,12 @@ func TestS3ExternalConnection(t *testing.T) {
3939
dir, dirCleanupFn := testutils.TempDir(t)
4040
defer dirCleanupFn()
4141

42-
params := base.TestClusterArgs{}
43-
params.ServerArgs.ExternalIODir = dir
44-
45-
tc := testcluster.StartTestCluster(t, 1, params)
46-
defer tc.Stopper().Stop(context.Background())
42+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
43+
ExternalIODir: dir,
44+
})
45+
defer ts.Stopper().Stop(context.Background())
4746

48-
tc.WaitForNodeLiveness(t)
49-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
47+
sqlDB := sqlutils.MakeSQLRunner(db)
5048

5149
// Setup some dummy data.
5250
sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -194,14 +192,11 @@ func TestAWSKMSExternalConnection(t *testing.T) {
194192
dir, dirCleanupFn := testutils.TempDir(t)
195193
defer dirCleanupFn()
196194

197-
params := base.TestClusterArgs{}
198-
params.ServerArgs.ExternalIODir = dir
199-
200-
tc := testcluster.StartTestCluster(t, 1, params)
201-
defer tc.Stopper().Stop(context.Background())
202-
203-
tc.WaitForNodeLiveness(t)
204-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
195+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
196+
ExternalIODir: dir,
197+
})
198+
defer ts.Stopper().Stop(context.Background())
199+
sqlDB := sqlutils.MakeSQLRunner(db)
205200

206201
// Setup some dummy data.
207202
sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -304,14 +299,11 @@ func TestAWSKMSExternalConnectionAssumeRole(t *testing.T) {
304299
dir, dirCleanupFn := testutils.TempDir(t)
305300
defer dirCleanupFn()
306301

307-
params := base.TestClusterArgs{}
308-
params.ServerArgs.ExternalIODir = dir
309-
310-
tc := testcluster.StartTestCluster(t, 1, params)
311-
defer tc.Stopper().Stop(context.Background())
312-
313-
tc.WaitForNodeLiveness(t)
314-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
302+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
303+
ExternalIODir: dir,
304+
})
305+
defer ts.Stopper().Stop(context.Background())
306+
sqlDB := sqlutils.MakeSQLRunner(db)
315307

316308
// Setup some dummy data.
317309
sqlDB.Exec(t, `CREATE DATABASE foo`)

‎pkg/ccl/cloudccl/azure/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ go_test(
2222
"//pkg/testutils/serverutils",
2323
"//pkg/testutils/skip",
2424
"//pkg/testutils/sqlutils",
25-
"//pkg/testutils/testcluster",
2625
"//pkg/util/leaktest",
2726
"//pkg/util/log",
2827
"//pkg/util/randutil",

‎pkg/ccl/cloudccl/azure/azure_connection_test.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"github.com/cockroachdb/cockroach/pkg/cloud/cloudtestutils"
2424
_ "github.com/cockroachdb/cockroach/pkg/cloud/externalconn/providers" // import External Connection providers.
2525
"github.com/cockroachdb/cockroach/pkg/testutils"
26+
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
2627
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
2728
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
28-
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2929
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
3030
"github.com/cockroachdb/cockroach/pkg/util/log"
3131
)
@@ -65,14 +65,12 @@ func TestExternalConnections(t *testing.T) {
6565
dir, dirCleanupFn := testutils.TempDir(t)
6666
defer dirCleanupFn()
6767

68-
params := base.TestClusterArgs{}
69-
params.ServerArgs.ExternalIODir = dir
68+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
69+
ExternalIODir: dir,
70+
})
71+
defer ts.Stopper().Stop(context.Background())
7072

71-
tc := testcluster.StartTestCluster(t, 1, params)
72-
defer tc.Stopper().Stop(context.Background())
73-
74-
tc.WaitForNodeLiveness(t)
75-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
73+
sqlDB := sqlutils.MakeSQLRunner(db)
7674

7775
// Setup some dummy data.
7876
sqlDB.Exec(t, `CREATE DATABASE foo`)

‎pkg/ccl/cloudccl/azure/main_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"github.com/cockroachdb/cockroach/pkg/security/securitytest"
1919
"github.com/cockroachdb/cockroach/pkg/server"
2020
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
21-
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2221
"github.com/cockroachdb/cockroach/pkg/util/randutil"
2322
)
2423

@@ -28,7 +27,6 @@ func TestMain(m *testing.M) {
2827
securityassets.SetLoader(securitytest.EmbeddedAssets)
2928
randutil.SeedForTests()
3029
serverutils.InitTestServerFactory(server.TestServerFactory)
31-
serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
3230
os.Exit(m.Run())
3331
}
3432

‎pkg/ccl/cloudccl/externalconn/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ go_test(
3131
"//pkg/testutils/sqlutils",
3232
"//pkg/testutils/testcluster",
3333
"//pkg/util/leaktest",
34+
"//pkg/util/log",
3435
"//pkg/util/randutil",
3536
"@com_github_cockroachdb_datadriven//:datadriven",
3637
"@com_github_stretchr_testify//require",

‎pkg/ccl/cloudccl/externalconn/datadriven_test.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
2828
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2929
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
30+
"github.com/cockroachdb/cockroach/pkg/util/log"
3031
"github.com/cockroachdb/datadriven"
3132
"github.com/stretchr/testify/require"
3233
)
@@ -36,6 +37,8 @@ func TestDataDriven(t *testing.T) {
3637

3738
ctx := context.Background()
3839
datadriven.Walk(t, datapathutils.TestDataPath(t), func(t *testing.T, path string) {
40+
defer log.Scope(t).Close(t)
41+
3942
dir, dirCleanupFn := testutils.TempDir(t)
4043
defer dirCleanupFn()
4144

@@ -51,7 +54,7 @@ func TestDataDriven(t *testing.T) {
5154
}
5255
tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{
5356
ServerArgs: base.TestServerArgs{
54-
DefaultTestTenant: base.TestTenantProbabilistic,
57+
DefaultTestTenant: base.TestControlsTenantsExplicitly,
5558
Knobs: base.TestingKnobs{
5659
JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), // speeds up test
5760
ExternalConnection: ecTestingKnobs,

‎pkg/ccl/cloudccl/gcp/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_test(
2323
"//pkg/testutils/serverutils",
2424
"//pkg/testutils/skip",
2525
"//pkg/testutils/sqlutils",
26-
"//pkg/testutils/testcluster",
2726
"//pkg/util/leaktest",
2827
"//pkg/util/log",
2928
"//pkg/util/randutil",

‎pkg/ccl/cloudccl/gcp/gcp_connection_test.go‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/cockroachdb/cockroach/pkg/cloud/gcp"
2828
_ "github.com/cockroachdb/cockroach/pkg/cloud/impl" // register ExternalStorage providers.
2929
"github.com/cockroachdb/cockroach/pkg/testutils"
30+
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
3031
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
3132
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
32-
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
3333
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
3434
"github.com/cockroachdb/cockroach/pkg/util/log"
3535
"github.com/stretchr/testify/require"
@@ -43,14 +43,11 @@ func TestGCPKMSExternalConnection(t *testing.T) {
4343
dir, dirCleanupFn := testutils.TempDir(t)
4444
defer dirCleanupFn()
4545

46-
params := base.TestClusterArgs{}
47-
params.ServerArgs.ExternalIODir = dir
48-
49-
tc := testcluster.StartTestCluster(t, 1, params)
50-
defer tc.Stopper().Stop(context.Background())
51-
52-
tc.WaitForNodeLiveness(t)
53-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
46+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
47+
ExternalIODir: dir,
48+
})
49+
defer ts.Stopper().Stop(context.Background())
50+
sqlDB := sqlutils.MakeSQLRunner(db)
5451

5552
// Setup some dummy data.
5653
sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -172,14 +169,11 @@ func TestGCPKMSExternalConnectionAssumeRole(t *testing.T) {
172169
dir, dirCleanupFn := testutils.TempDir(t)
173170
defer dirCleanupFn()
174171

175-
params := base.TestClusterArgs{}
176-
params.ServerArgs.ExternalIODir = dir
177-
178-
tc := testcluster.StartTestCluster(t, 1, params)
179-
defer tc.Stopper().Stop(context.Background())
180-
181-
tc.WaitForNodeLiveness(t)
182-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
172+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
173+
ExternalIODir: dir,
174+
})
175+
defer ts.Stopper().Stop(context.Background())
176+
sqlDB := sqlutils.MakeSQLRunner(db)
183177

184178
// Setup some dummy data.
185179
sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -301,14 +295,11 @@ func TestGCPAssumeRoleExternalConnection(t *testing.T) {
301295
dir, dirCleanupFn := testutils.TempDir(t)
302296
defer dirCleanupFn()
303297

304-
params := base.TestClusterArgs{}
305-
params.ServerArgs.ExternalIODir = dir
306-
307-
tc := testcluster.StartTestCluster(t, 1, params)
308-
defer tc.Stopper().Stop(context.Background())
309-
310-
tc.WaitForNodeLiveness(t)
311-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
298+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
299+
ExternalIODir: dir,
300+
})
301+
defer ts.Stopper().Stop(context.Background())
302+
sqlDB := sqlutils.MakeSQLRunner(db)
312303

313304
// Setup some dummy data.
314305
sqlDB.Exec(t, `CREATE DATABASE foo`)
@@ -452,14 +443,11 @@ func TestGCPExternalConnection(t *testing.T) {
452443
dir, dirCleanupFn := testutils.TempDir(t)
453444
defer dirCleanupFn()
454445

455-
params := base.TestClusterArgs{}
456-
params.ServerArgs.ExternalIODir = dir
457-
458-
tc := testcluster.StartTestCluster(t, 1, params)
459-
defer tc.Stopper().Stop(context.Background())
460-
461-
tc.WaitForNodeLiveness(t)
462-
sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0])
446+
ts, db, _ := serverutils.StartServer(t, base.TestServerArgs{
447+
ExternalIODir: dir,
448+
})
449+
defer ts.Stopper().Stop(context.Background())
450+
sqlDB := sqlutils.MakeSQLRunner(db)
463451

464452
// Setup some dummy data.
465453
sqlDB.Exec(t, `CREATE DATABASE foo`)

0 commit comments

Comments
 (0)