Merge branch 'master' into node_server_graceful_shutdown

pull/2993/head
murgatroid99 9 years ago
commit 2c3938eab0
  1. 4
      include/grpc++/impl/README.md
  2. 4
      src/core/surface/version.c
  3. 4
      src/node/interop/interop_client.js
  4. 6
      src/node/test/surface_test.js

@ -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.

@ -36,4 +36,6 @@
#include <grpc/grpc.h>
const char *grpc_version_string(void) { return "0.10.1.0"; }
const char *grpc_version_string(void) {
return "0.10.1.0";
}

@ -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();
});
}

@ -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();
});
};

Loading…
Cancel
Save