fix: Integration test close function again (#1103)

danieljbruce · web-flow · commit 10dcd217a6f2 · 2022-07-12T13:07:41.000-04:00
* First try

* Add after hook

* Proper test done for closed client

* test description change

* Eliminate unnecessary comment

* Modify test to reflect change
diff --git a/src/index.ts b/src/index.ts
@@ -940,7 +940,7 @@ export class Bigtable {
  * that a callback is omitted.
  */
 promisifyAll(Bigtable, {
-  exclude: ['instance', 'operation', 'request'],
+  exclude: ['close', 'instance', 'operation', 'request'],
 });
 
 /**
diff --git a/system-test/read-rows.ts b/system-test/read-rows.ts
@@ -23,7 +23,7 @@ import {describe, it, afterEach, beforeEach} from 'mocha';
 import * as sinon from 'sinon';
 import {EventEmitter} from 'events';
 import {Test} from './testTypes';
-import {ServiceError, GrpcClient} from 'google-gax';
+import {ServiceError, GrpcClient, GoogleError} from 'google-gax';
 import {PassThrough} from 'stream';
 
 const {grpc} = new GrpcClient();
@@ -77,12 +77,43 @@ function rowResponse(rowKey: {}) {
 
 describe('Bigtable/Table', () => {
   const bigtable = new Bigtable();
+  const INSTANCE_NAME = 'fake-instance2';
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (bigtable as any).grpcCredentials = grpc.credentials.createInsecure();
 
   const INSTANCE = bigtable.instance('instance');
   const TABLE = INSTANCE.table('table');
 
+  describe('close', () => {
+    it('should fail when invoking readRows with closed client', async () => {
+      const instance = bigtable.instance(INSTANCE_NAME);
+      const table = instance.table('fake-table');
+      await instance.create({
+        clusters: {
+          id: 'fake-cluster3',
+          location: 'us-west1-c',
+          nodes: 1,
+        },
+      });
+      await table.create({});
+      await table.getRows(); // This is done to initialize the data client
+      await bigtable.close();
+      try {
+        await table.getRows();
+        assert.fail(
+          'An error should have been thrown because the client is closed'
+        );
+      } catch (err: any) {
+        assert.strictEqual(err.message, 'The client has already been closed.');
+      }
+    });
+    after(async () => {
+      const bigtableSecondClient = new Bigtable();
+      const instance = bigtableSecondClient.instance(INSTANCE_NAME);
+      await instance.delete({});
+    });
+  });
+
   describe('createReadStream', () => {
     let clock: sinon.SinonFakeTimers;
     let endCalled: boolean;
diff --git a/test/index.ts b/test/index.ts
@@ -48,6 +48,7 @@ const fakePromisify = Object.assign({}, promisify, {
     }
     promisified = true;
     assert.deepStrictEqual(options.exclude, [
+      'close',
       'instance',
       'operation',
       'request',

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ const fakePromisify = Object.assign({}, promisify, {`
`48`	`48`	`}`
`49`	`49`	`promisified = true;`
`50`	`50`	`assert.deepStrictEqual(options.exclude, [`
	`51`	`+ 'close',`
`51`	`52`	`'instance',`
`52`	`53`	`'operation',`
`53`	`54`	`'request',`