upgrade to grpc@0.14.0 (#1288)

stephenplusplus · callmehiphop · commit f5ca22fbd19e · 2016-05-12T11:14:38.000-04:00
diff --git a/lib/common/grpc-service.js b/lib/common/grpc-service.js
@@ -266,7 +266,7 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
     request: function(_, onResponse) {
       respError = null;
 
-      service[protoOpts.method](reqOpts, function(err, resp) {
+      service[protoOpts.method](reqOpts, grpcOpts, function(err, resp) {
         if (err) {
           if (HTTP_ERROR_CODE_MAP[err.code]) {
             respError = extend(err, HTTP_ERROR_CODE_MAP[err.code]);
@@ -279,7 +279,7 @@ GrpcService.prototype.request = function(protoOpts, reqOpts, callback) {
         }
 
         onResponse(null, resp);
-      }, null, grpcOpts);
+      });
     }
   }, function(err, resp) {
     if (!err && resp === respError) {
diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
     "gcs-resumable-upload": "^0.5.0",
     "google-auto-auth": "^0.2.0",
     "google-proto-files": "^0.1.1",
-    "grpc": "^0.13.1",
+    "grpc": "^0.14.1",
     "hash-stream-validation": "^0.1.0",
     "is": "^3.0.1",
     "methmeth": "^1.0.0",
diff --git a/system-test/pubsub.js b/system-test/pubsub.js
@@ -361,7 +361,7 @@ describe('pubsub', function() {
         assert.ifError(err);
 
         assert.deepEqual(policy.bindings, []);
-        assert.strictEqual(policy.etag.toString(), '\u0000 \u0001');
+        assert.strictEqual(policy.etag, 'ACAB');
         assert.strictEqual(policy.version, 0);
 
         done();
diff --git a/test/common/grpc-service.js b/test/common/grpc-service.js
@@ -522,7 +522,7 @@ describe('GrpcService', function() {
         grpcService.protos.Service = {
           service: function() {
             return {
-              method: function(reqOpts, callback) {
+              method: function(reqOpts, grpcOpts, callback) {
                 callback(grpcError500);
               }
             };
@@ -547,7 +547,7 @@ describe('GrpcService', function() {
         grpcService.protos.Service = {
           service: function() {
             return {
-              method: function(reqOpts, callback) {
+              method: function(reqOpts, grpcOpts, callback) {
                 callback(grpcError500);
               }
             };
@@ -590,7 +590,7 @@ describe('GrpcService', function() {
       grpcService.protos.Service = {
         service: function() {
           return {
-            method: function(reqOpts, callback, _, grpcOpts) {
+            method: function(reqOpts, grpcOpts) {
               assert(is.date(grpcOpts.deadline));
 
               assert(grpcOpts.deadline.getTime() > expectedDeadlineRange[0]);
@@ -634,7 +634,7 @@ describe('GrpcService', function() {
           grpcService.protos.Service = {
             service: function() {
               return {
-                method: function(reqOpts, callback) {
+                method: function(reqOpts, grpcOpts, callback) {
                   callback(grpcError);
                 }
               };
@@ -657,7 +657,7 @@ describe('GrpcService', function() {
         grpcService.protos.Service = {
           service: function() {
             return {
-              method: function(reqOpts, callback) {
+              method: function(reqOpts, grpcOpts, callback) {
                 callback(null, RESPONSE);
               }
             };
