File tree Expand file tree Collapse file tree 4 files changed +9
-0
lines changed
Expand file tree Collapse file tree 4 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -75,6 +75,7 @@ go_test(
7575 ],
7676 embed = [":execbuilder" ],
7777 deps = [
78+ "//pkg/base" ,
7879 "//pkg/security/securityassets" ,
7980 "//pkg/security/securitytest" ,
8081 "//pkg/server" ,
Original file line number Diff line number Diff line change 99 "os"
1010 "testing"
1111
12+ "github.com/cockroachdb/cockroach/pkg/base"
1213 "github.com/cockroachdb/cockroach/pkg/security/securityassets"
1314 "github.com/cockroachdb/cockroach/pkg/security/securitytest"
1415 "github.com/cockroachdb/cockroach/pkg/server"
@@ -24,6 +25,9 @@ func TestMain(m *testing.M) {
2425 randutil .SeedForTests ()
2526 serverutils .InitTestServerFactory (server .TestServerFactory )
2627 serverutils .InitTestClusterFactory (testcluster .TestClusterFactory )
28+ // With DRPC enabled, its cluster setting "rpc.experimental_drpc.enabled"
29+ // interferes with some tests hence we disable it here.
30+ serverutils .TestingGlobalDRPCOption (base .TestDRPCDisabled )
2731
2832 os .Exit (m .Run ())
2933}
Original file line number Diff line number Diff line change 99 "os"
1010 "testing"
1111
12+ "github.com/cockroachdb/cockroach/pkg/base"
1213 "github.com/cockroachdb/cockroach/pkg/ccl"
1314 "github.com/cockroachdb/cockroach/pkg/security/securityassets"
1415 "github.com/cockroachdb/cockroach/pkg/security/securitytest"
@@ -20,5 +21,6 @@ func TestMain(m *testing.M) {
2021 defer ccl .TestingEnableEnterprise ()()
2122 securityassets .SetLoader (securitytest .EmbeddedAssets )
2223 serverutils .InitTestServerFactory (server .TestServerFactory )
24+ serverutils .TestingGlobalDRPCOption (base .TestDRPCEnabledRandomly )
2325 os .Exit (m .Run ())
2426}
Original file line number Diff line number Diff line change 99 "os"
1010 "testing"
1111
12+ "github.com/cockroachdb/cockroach/pkg/base"
1213 "github.com/cockroachdb/cockroach/pkg/security/securityassets"
1314 "github.com/cockroachdb/cockroach/pkg/security/securitytest"
1415 "github.com/cockroachdb/cockroach/pkg/server"
@@ -20,6 +21,7 @@ func TestMain(m *testing.M) {
2021 securityassets .SetLoader (securitytest .EmbeddedAssets )
2122 randutil .SeedForTests ()
2223 serverutils .InitTestServerFactory (server .TestServerFactory )
24+ serverutils .TestingGlobalDRPCOption (base .TestDRPCEnabledRandomly )
2325
2426 os .Exit (m .Run ())
2527}
You can’t perform that action at this time.
0 commit comments