Merge #155703

155703: kvserver: small cleanup in TestTenantCtx r=arulajmani a=stevendanna

This test recently failed during the CI run of an unrelated PR with the following error:

 expected Scan to run as the expected tenant ({10}), but it isn't.
 tenant request: false, tenantID: {0}

However, _in addition_ the test also hit a panic because it was accessing a nil tx2 because it used assert.NoError rather than require.NoError. Here, I re-arrange the test a bit to avoid this. It doesn't solve whatever cause the original failure though, which doesn't seem to what to reproduce under stress yet.

Epic: none
Release note: None

Co-authored-by: Steven Danna <danna@cockroachlabs.com>

Author: craig[bot]

pkg/kv/kvserver/client_tenant_test.go

@@ -35,6 +35,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/upgrade/upgradebase"
+	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -482,16 +483,19 @@ func TestTenantCtx(t *testing.T) {
 		_, err = tx1.Exec("insert into t(x) values ($1)", magicKey)
 		require.NoError(t, err)
 
-		var tx2 *gosql.Tx
-		var tx2C = make(chan struct{})
-		go func() {
-			var err error
-			tx2, err = tsql.BeginTx(ctx, nil /* opts */)
-			assert.NoError(t, err)
+		g := ctxgroup.WithContext(ctx)
+		g.Go(func() error {
+			tx2, err := tsql.BeginTx(ctx, nil /* opts */)
+			if err != nil {
+				return err
+			}
+			// This SELECT should be blocked by the insert on tx1.
 			_, err = tx2.Exec("select * from t where x = $1", magicKey)
-			assert.NoError(t, err)
-			close(tx2C)
-		}()
+			if err != nil {
+				return err
+			}
+			return tx2.Rollback()
+		})
 
 		// Wait for tx2 goroutine to send the PushTxn request, and then roll back tx1
 		// to unblock tx2.
@@ -507,9 +511,7 @@ func TestTenantCtx(t *testing.T) {
 		case <-time.After(3 * time.Second):
 			t.Fatal("timed out waiting for PushTxn")
 		}
-		_ = tx1.Rollback()
-		// Wait for tx2 to be unblocked.
-		<-tx2C
-		_ = tx2.Rollback()
+		require.NoError(t, tx1.Rollback())
+		require.NoError(t, g.Wait())
 	})
 }