From 5be35c9a4b18a2cba6ed3679e434004196595c0e Mon Sep 17 00:00:00 2001
From: David Hartunian <davidh@cockroachlabs.com>
Date: Fri, 11 Oct 2024 12:13:15 -0400
Subject: [PATCH] server: fix merge skew; skip under race

Added skip under race to match other branches.

Release note: None
---
 pkg/ccl/serverccl/statusccl/tenant_status_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/ccl/serverccl/statusccl/tenant_status_test.go b/pkg/ccl/serverccl/statusccl/tenant_status_test.go
index 2db12ad594da..d13ccb596c6d 100644
--- a/pkg/ccl/serverccl/statusccl/tenant_status_test.go
+++ b/pkg/ccl/serverccl/statusccl/tenant_status_test.go
@@ -1590,6 +1590,8 @@ 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{
@@ -1597,7 +1599,6 @@ func TestThrottlingMetadata(t *testing.T) {
 			Knobs: base.TestingKnobs{
 				Server: &server.TestingKnobs{
 					LicenseTestingKnobs: license.TestingKnobs{
-						Enable:            true,
 						OverrideStartTime: &testtime,
 					},
 				},