From 324fce2b3a650f0c37ccf14833b548af4927279f Mon Sep 17 00:00:00 2001
From: Stephen Sawchuk <sawchuk@gmail.com>
Date: Wed, 30 Nov 2016 12:40:23 -0500
Subject: [PATCH] common: emit response event on correct stream

---
 packages/common/src/grpc-service.js  | 2 +-
 packages/common/test/grpc-service.js | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/common/src/grpc-service.js b/packages/common/src/grpc-service.js
index 68a0a54e1eb..3d2adaae92e 100644
--- a/packages/common/src/grpc-service.js
+++ b/packages/common/src/grpc-service.js
@@ -361,7 +361,7 @@ GrpcService.prototype.requestStream = function(protoOpts, reqOpts) {
           // https://github.com/GoogleCloudPlatform/google-cloud-node/pull/1444#discussion_r71812636
           var grcpStatus = GrpcService.decorateStatus_({ code: 0 });
 
-          this.emit('response', grcpStatus);
+          stream.emit('response', grcpStatus);
         });
     }
   };
diff --git a/packages/common/test/grpc-service.js b/packages/common/test/grpc-service.js
index 98a532bcaae..5bf8d2b72a0 100644
--- a/packages/common/test/grpc-service.js
+++ b/packages/common/test/grpc-service.js
@@ -1178,14 +1178,12 @@ describe('GrpcService', function() {
           return options.request();
         };
 
-        fakeStream
-          .on('error', done)
+        grpcService.requestStream(PROTO_OPTS, REQ_OPTS)
           .on('response', function(resp) {
             assert.deepEqual(resp, GrpcService.GRPC_ERROR_CODE_TO_HTTP[0]);
             done();
           });
 
-        grpcService.requestStream(PROTO_OPTS, REQ_OPTS);
         fakeStream.emit('metadata');
       });