Merge pull request #83478 from cockroachdb/blathers/backport-release-…

…22.1-83457

release-22.1: ccl/sqlproxyccl: fix TestConnectionMigration test flake

pkg/ccl/sqlproxyccl/proxy_handler_test.go

@@ -1230,10 +1230,8 @@ func TestConnectionMigration(t *testing.T) {
 		conn, err := db.Conn(tCtx)
 		require.NoError(t, err)
 
-		// Spin up a goroutine to trigger the initial connection.
-		go func() {
-			_ = conn.PingContext(tCtx)
-		}()
+		// Trigger the initial connection.
+		require.NoError(t, conn.PingContext(tCtx))
 
 		var f *forwarder
 		require.Eventually(t, func() bool {
@@ -1283,16 +1281,10 @@ func TestConnectionMigration(t *testing.T) {
 		// one test.
 		<-goCh
 		time.Sleep(2 * time.Second)
-		// This should be an error because the transfer timed out.
+		// This should be an error because the transfer timed out. Connection
+		// should automatically be closed.
 		require.Error(t, f.TransferConnection())
 
-		// Connection should be closed because this is a non-recoverable error,
-		// i.e. timeout after sending the request, but before fully receiving
-		// its response.
-		err = conn.PingContext(tCtx)
-		require.Error(t, err)
-		require.Regexp(t, "(closed|bad connection)", err.Error())
-
 		select {
 		case <-time.After(10 * time.Second):
 			t.Fatalf("require that pg_sleep query terminates")