tests: revert createReadStreamInternal changes to avoid stepping on data loss mines

Author: feywind

src/utils/createReadStreamInternal.ts

@@ -428,19 +428,6 @@ export function createReadStreamInternal(
     rowStreamPipe(rowStream, userStream);
   };
 
-  // If the timeout is exceeded for the whole operation, bail with
-  // an error as the conformance test requires.
-  if (timeout) {
-    const deadlineTimer = setTimeout(() => {
-      const err = new Error(`Total timeout of ${timeout}ms exceeded.`);
-      (err as unknown as grpc.StatusObject).code =
-        grpc.status.DEADLINE_EXCEEDED;
-      userStream.destroy(err);
-    }, timeout);
-
-    userStream.on('close', () => clearTimeout(deadlineTimer));
-  }
-
   makeNewRequest();
   return userStream;
 }

test/table.ts

@@ -1190,10 +1190,7 @@ describe('Bigtable/Table', () => {
           .on('data', done);
       });
     });
-
-    // Skip: This test currently doesn't make sense after conformance test
-    // changes. The error will always be DEADLINE_EXCEEDED, not UNAVAILABLE.
-    it.skip('Should respect the timeout parameter passed in for UNAVAILABLE error', done => {
+    it('Should respect the timeout parameter passed in for UNAVAILABLE error', done => {
       // The timeout is 2 seconds, but the error is received after 3 seconds
       // so the client doesn't retry because more than 2 seconds have elapsed.
       const requestSpy = (table.bigtable.request = sinon.spy(() => {
@@ -1216,11 +1213,9 @@ describe('Bigtable/Table', () => {
         done();
       });
     });
-
     it('Should respect the timeout parameter passed in for DEADLINE_EXCEEDED error', done => {
       // The timeout is 2 seconds, but the error is received after 3 seconds
       // so the client doesn't retry because more than 2 seconds have elapsed.
-      let timeoutReceived = false;
       const requestSpy = (table.bigtable.request = sinon.spy(() => {
         const stream = new PassThrough({
           objectMode: true,
@@ -1235,16 +1230,6 @@ describe('Bigtable/Table', () => {
       }));
       const stream = table.createReadStream({gaxOptions: {timeout: 2000}});
       stream.on('error', (error: ServiceError) => {
-        if (!timeoutReceived) {
-          assert.strictEqual(error.code, 4);
-          assert.strictEqual(
-            error.message,
-            'Total timeout of 2000ms exceeded.',
-          );
-          assert.strictEqual(requestSpy.callCount, 1); // Ensures the client has not retried.
-          done();
-        }
-        timeoutReceived = true;
       });
     });
     describe('retries', () => {