test: Try eliminating generated close client

src/tabular-api-surface.ts

@@ -29,7 +29,7 @@
 import {ChunkTransformer} from './chunktransformer';
 import {BackoffSettings} from 'google-gax/build/src/gax';
 import {google} from '../protos/protos';
-import {CallOptions, ServiceError} from 'google-gax';
+import {CallOptions, grpc, ServiceError} from 'google-gax';
 import {Duplex, PassThrough, Transform} from 'stream';
 import * as is from 'is';
 import {GoogleInnerError} from './table';
@@ -325,7 +325,7 @@
         // Handling retries in this client. Specify the retry options to
         // make sure nothing is retried in retry-request.
         noResponseRetries: 0,
         shouldRetryFn: (_: any) => {
           return false;
         },
       };
@@ -480,10 +480,23 @@
             );
             retryTimer = setTimeout(makeNewRequest, nextRetryDelay);
           } else {
+            if (
+              !error.code &&
+              error.message === 'The client has already been closed.'
+            ) {
+              //
+              // The TestReadRows_Generic_CloseClient conformance test requires
+              // a grpc code to be present when the client is closed. According
+              // to Gemini, the appropriate code for a closed client is
+              // CANCELLED since the user actually cancelled the call by closing
+              // the client.
+              //
+              error.code = grpc.status.CANCELLED;
+            }
             userStream.emit('error', error);
           }
         })
         .on('data', _ => {
           // Reset error count after a successful read so the backoff
           // time won't keep increasing when as stream had multiple errors
           numConsecutiveErrors = 0;
@@ -706,7 +719,7 @@
         // Handling retries in this client. Specify the retry options to
         // make sure nothing is retried in retry-request.
         noResponseRetries: 0,
         shouldRetryFn: (_: any) => {
           return false;
         },
       };

testproxy/services/close-client.js

@@ -15,7 +15,7 @@
 
 const normalizeCallback = require('./utils/normalize-callback.js');
 
 const v2 = Symbol.for('v2');
 
 const closeClient = ({clientMap}) =>
   normalizeCallback(async rawRequest => {
@@ -24,7 +24,7 @@
     const bigtable = clientMap.get(clientId);
 
     if (bigtable) {
-      await bigtable[v2].close();
+      // await bigtable[v2].close();
       await bigtable.close();
       return {};
     }