From 0037326f094b8d93008c6c94c9f2028a312effb4 Mon Sep 17 00:00:00 2001
From: David Hartunian <davidh@cockroachlabs.com>
Date: Tue, 14 Sep 2021 19:11:20 -0400
Subject: [PATCH] sql: add consistent testing knobs to all tenants

The tenant gRPC fanout tests that request statement statistics did not
consistently apply the testing knob added on the first tenant to the
other two. This commit copies the same testing knob value to those
tenants.

Release note: None
---
 .../serverccl/statusccl/tenant_grpc_test.go   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkg/ccl/serverccl/statusccl/tenant_grpc_test.go b/pkg/ccl/serverccl/statusccl/tenant_grpc_test.go
index ee2d54189eb1..8868fdf69648 100644
--- a/pkg/ccl/serverccl/statusccl/tenant_grpc_test.go
+++ b/pkg/ccl/serverccl/statusccl/tenant_grpc_test.go
@@ -46,13 +46,14 @@ func TestTenantGRPCServices(t *testing.T) {
 	server := testCluster.Server(0)
 
 	tenantID := serverutils.TestTenantID()
-	tenant, connTenant := serverutils.StartTenant(t, server, base.TestTenantArgs{
-		TenantID: tenantID,
-		TestingKnobs: base.TestingKnobs{
-			SQLStatsKnobs: &sqlstats.TestingKnobs{
-				AOSTClause: "AS OF SYSTEM TIME '-1us'",
-			},
+	testingKnobs := base.TestingKnobs{
+		SQLStatsKnobs: &sqlstats.TestingKnobs{
+			AOSTClause: "AS OF SYSTEM TIME '-1us'",
 		},
+	}
+	tenant, connTenant := serverutils.StartTenant(t, server, base.TestTenantArgs{
+		TenantID:     tenantID,
+		TestingKnobs: testingKnobs,
 	})
 	defer connTenant.Close()
 
@@ -92,8 +93,9 @@ func TestTenantGRPCServices(t *testing.T) {
 
 	log.TestingClearServerIdentifiers()
 	tenant2, connTenant2 := serverutils.StartTenant(t, server, base.TestTenantArgs{
-		TenantID: tenantID,
-		Existing: true,
+		TenantID:     tenantID,
+		Existing:     true,
+		TestingKnobs: testingKnobs,
 	})
 	defer connTenant2.Close()
 
@@ -110,7 +112,8 @@ func TestTenantGRPCServices(t *testing.T) {
 
 	log.TestingClearServerIdentifiers()
 	tenant3, connTenant3 := serverutils.StartTenant(t, server, base.TestTenantArgs{
-		TenantID: roachpb.MakeTenantID(11),
+		TenantID:     roachpb.MakeTenantID(11),
+		TestingKnobs: testingKnobs,
 	})
 	defer connTenant3.Close()