From aac8f141cba18e9dc3b565085673fcc2dae4fe24 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 17 Aug 2015 13:35:54 -0700 Subject: [PATCH 1/3] Made deadline tests accept INTERNAL status --- src/node/interop/interop_client.js | 4 +++- src/node/test/surface_test.js | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/node/interop/interop_client.js b/src/node/interop/interop_client.js index 6d6f9a349e5..612dcf01f65 100644 --- a/src/node/interop/interop_client.js +++ b/src/node/interop/interop_client.js @@ -264,7 +264,9 @@ function timeoutOnSleepingServer(client, done) { payload: {body: zeroBuffer(27182)} }); call.on('error', function(error) { - assert.strictEqual(error.code, grpc.status.DEADLINE_EXCEEDED); + + assert(error.code === grpc.status.DEADLINE_EXCEEDED || + error.code === grpc.status.INTERNAL); done(); }); } diff --git a/src/node/test/surface_test.js b/src/node/test/surface_test.js index 52515cc8e7c..ec7ed87728d 100644 --- a/src/node/test/surface_test.js +++ b/src/node/test/surface_test.js @@ -784,7 +784,8 @@ describe('Other conditions', function() { client.clientStream(function(err, value) { try { assert(err); - assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); + assert(err.code === grpc.status.DEADLINE_EXCEEDED || + err.code === grpc.status.INTERNAL); } finally { callback(err, value); done(); @@ -809,7 +810,8 @@ describe('Other conditions', function() { null, {parent: parent, propagate_flags: deadline_flags}); child.on('error', function(err) { assert(err); - assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); + assert(err.code === grpc.status.DEADLINE_EXCEEDED || + err.code === grpc.status.INTERNAL); done(); }); }; From b9b9d6ee8e969aa1cd987f5153b8be616424a719 Mon Sep 17 00:00:00 2001 From: yang-g Date: Tue, 18 Aug 2015 12:56:58 -0700 Subject: [PATCH 2/3] add a README for include/grpc++/impl --- include/grpc++/impl/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 include/grpc++/impl/README.md diff --git a/include/grpc++/impl/README.md b/include/grpc++/impl/README.md new file mode 100644 index 00000000000..612150caa04 --- /dev/null +++ b/include/grpc++/impl/README.md @@ -0,0 +1,4 @@ +**The APIs in this directory are not stable!** + +This directory contains header files that need to be installed but are not part +of the public API. Users should not use these headers directly. From f900fb84b26b04a246201ab9911f86a83e7ae523 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 18 Aug 2015 15:58:43 -0700 Subject: [PATCH 3/3] Fix build breakage --- src/core/surface/version.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/surface/version.c b/src/core/surface/version.c index 61e762eb601..d7aaba3868e 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,6 @@ #include -const char *grpc_version_string(void) { return "0.10.1.0"; } +const char *grpc_version_string(void) { + return "0.10.1.0"; +}