grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into node_server_graceful_shutdown

This commit is contained in:
murgatroid99 2015-08-18 18:23:38 -07:00
parent 465d03e171 bb36430c4f
commit b4b3852667
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interop/interop_client.js
View File

@ -264,7 +264,9 @@ function timeoutOnSleepingServer(client, done) {
payload: {body: zeroBuffer(27182)} payload: {body: zeroBuffer(27182)}
}); });
call.on('error', function(error) { 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(); done();
}); });
} }

6
test/surface_test.js
View File

@ -784,7 +784,8 @@ describe('Other conditions', function() {
client.clientStream(function(err, value) { client.clientStream(function(err, value) {
try { try {
assert(err); assert(err);
assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); assert(err.code === grpc.status.DEADLINE_EXCEEDED ||
err.code === grpc.status.INTERNAL);
} finally { } finally {
callback(err, value); callback(err, value);
done(); done();
@ -809,7 +810,8 @@ describe('Other conditions', function() {
null, {parent: parent, propagate_flags: deadline_flags}); null, {parent: parent, propagate_flags: deadline_flags});
child.on('error', function(err) { child.on('error', function(err) {
assert(err); assert(err);
assert.strictEqual(err.code, grpc.status.DEADLINE_EXCEEDED); assert(err.code === grpc.status.DEADLINE_EXCEEDED ||
err.code === grpc.status.INTERNAL);
done(); done();
}); });
}; };