Skip to content

Commit 4122999

Browse files
craig[bot]Marius PostaRenato Costaerikgrinaker
committed
106743: sctest: refactor cumulative tests r=postamar a=postamar This commit comprehensively refactors the cumulative test definitions for the declarative schema changer. Fixes cockroachdb#106920. Release note: None 107272: roachtest: set max lifetime for connections in local runs r=srosenberg,herkolategan a=renatolabs This change fixes an issue observed when running roachtests that restart nodes locally. This was primarily observed on M1s, but we apply the same change regardless of platform for consistency. Epic: none Release note: None 107443: rangefeed: remove `Config.CheckStreamsInterval` r=erikgrinaker a=erikgrinaker This parameter is unused. Epic: none Release note: None Co-authored-by: Marius Posta <[email protected]> Co-authored-by: Renato Costa <[email protected]> Co-authored-by: Erik Grinaker <[email protected]>
4 parents 63a18f9 + 2bd61c0 + 90662e7 + fc9e850 commit 4122999

37 files changed

+4888
-3733
lines changed

pkg/ccl/schemachangerccl/BUILD.bazel

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ go_test(
2121
"main_test.go",
2222
"schemachanger_ccl_test.go",
2323
":test_gen_backup_base", # keep
24-
":test_gen_backup_mixed_base", # keep
25-
":test_gen_backup_mixed_ccl", # keep
2624
":test_gen_ccl", # keep
2725
],
2826
args = select({
@@ -63,26 +61,16 @@ sctest_gen(
6361
name = "test_gen_backup_base",
6462
out = "backup_base_generated_test.go",
6563
ccl = True,
66-
new_cluster_func = "sctest.SingleNodeCluster",
64+
new_cluster_factory = "sctest.SingleNodeTestClusterFactory{}",
6765
package = "schemachangerccl",
6866
suffix = "_base",
6967
test_data = ["//pkg/sql/schemachanger:end_to_end_testdata_definitions"],
70-
tests = ["Backup"],
71-
visibility = [
72-
":__pkg__",
73-
"//pkg/gen:__pkg__",
68+
tests = [
69+
"BackupRollbacks",
70+
"BackupRollbacksMixedVersion",
71+
"BackupSuccess",
72+
"BackupSuccessMixedVersion",
7473
],
75-
)
76-
77-
sctest_gen(
78-
name = "test_gen_backup_mixed_base",
79-
out = "backup_base_mixed_generated_test.go",
80-
ccl = True,
81-
new_cluster_func = "sctest.SingleNodeMixedCluster",
82-
package = "schemachangerccl",
83-
suffix = "_base",
84-
test_data = ["//pkg/sql/schemachanger:end_to_end_testdata_definitions"],
85-
tests = ["BackupMixedVersionElements"],
8674
visibility = [
8775
":__pkg__",
8876
"//pkg/gen:__pkg__",
@@ -93,34 +81,24 @@ sctest_gen(
9381
name = "test_gen_ccl",
9482
out = "ccl_generated_test.go",
9583
ccl = True,
96-
new_cluster_func = "newMultiRegionCluster",
84+
new_cluster_factory = "MultiRegionTestClusterFactory{}",
9785
package = "schemachangerccl",
9886
suffix = "_ccl",
9987
test_data = [":end_to_end_ccl_testdata_definitions"],
10088
tests = [
101-
"Backup",
89+
"BackupRollbacks",
90+
"BackupRollbacksMixedVersion",
91+
"BackupSuccess",
92+
"BackupSuccessMixedVersion",
10293
"EndToEndSideEffects",
94+
"ExecuteWithDMLInjection",
10395
"GenerateSchemaChangeCorpus",
10496
"Pause",
97+
"PauseMixedVersion",
10598
"Rollback",
10699
],
107100
visibility = [
108101
":__pkg__",
109102
"//pkg/gen:__pkg__",
110103
],
111104
)
112-
113-
sctest_gen(
114-
name = "test_gen_backup_mixed_ccl",
115-
out = "backup_ccl_mixed_generated_test.go",
116-
ccl = True,
117-
new_cluster_func = "newMultiRegionMixedCluster",
118-
package = "schemachangerccl",
119-
suffix = "_ccl",
120-
test_data = [":end_to_end_ccl_testdata_definitions"],
121-
tests = ["BackupMixedVersionElements"],
122-
visibility = [
123-
":__pkg__",
124-
"//pkg/gen:__pkg__",
125-
],
126-
)

0 commit comments

Comments
 (0)