Merge pull request cockroachdb#132459 from dhartunian/fix-merge-skew-…

…and-skip-under-race-23.2 server: fix merge skew; skip under race
mgartner · Oct 11, 2024 · 965cf7a · 965cf7a
2 parents e8bf1f4 + 5be35c9
commit 965cf7a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/ccl/serverccl/statusccl/tenant_status_test.go b/pkg/ccl/serverccl/statusccl/tenant_status_test.go
@@ -1590,14 +1590,15 @@ func TestThrottlingMetadata(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t, "times out under race")
+
 	testtime := timeutil.Now()
 
 	s := serverutils.StartCluster(t, 3, base.TestClusterArgs{
 		ServerArgs: base.TestServerArgs{
 			Knobs: base.TestingKnobs{
 				Server: &server.TestingKnobs{
 					LicenseTestingKnobs: license.TestingKnobs{
-						Enable:            true,
 						OverrideStartTime: &testtime,
 					},
 				},