From 4e7f4dff1708c53ce9d53429a2694aa17c2b9669 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 30 Sep 2019 15:56:15 -0700
Subject: [PATCH] Also use original call metadata

---
 packages/grpc-js/src/channel.ts                | 2 +-
 packages/grpc-js/test/test-server-deadlines.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grpc-js/src/channel.ts b/packages/grpc-js/src/channel.ts
index 9d6f0049..e672072a 100644
--- a/packages/grpc-js/src/channel.ts
+++ b/packages/grpc-js/src/channel.ts
@@ -203,7 +203,7 @@ export class ChannelImplementation implements Channel {
           /* If the subchannel disconnects between calling pick and getting
            * the filter stack metadata, the call will end with an error. */
           callStream.filterStack
-            .sendMetadata(Promise.resolve(new Metadata()))
+            .sendMetadata(Promise.resolve(callMetadata))
             .then(
               finalMetadata => {
                 if (
diff --git a/packages/grpc-js/test/test-server-deadlines.ts b/packages/grpc-js/test/test-server-deadlines.ts
index 2a1d3df9..dc607917 100644
--- a/packages/grpc-js/test/test-server-deadlines.ts
+++ b/packages/grpc-js/test/test-server-deadlines.ts
@@ -83,9 +83,9 @@ describe('Server deadlines', () => {
       metadata,
       {},
       (error: any, response: any) => {
+        assert(error);
         assert.strictEqual(error.code, grpc.status.DEADLINE_EXCEEDED);
         assert.strictEqual(error.details, 'Deadline exceeded');
-        assert.strictEqual(error.message, 'Deadline exceeded');
         done();
       }
     );
@@ -108,9 +108,9 @@ describe('Server deadlines', () => {
       metadata,
       {},
       (error: any, response: any) => {
+        assert(error);
         assert.strictEqual(error.code, grpc.status.OUT_OF_RANGE);
         assert.strictEqual(error.details, 'Invalid deadline');
-        assert.strictEqual(error.message, 'Invalid deadline');
         done();
       }
     );