aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tim Emiola <tbetbetbe@users.noreply.github.com>2015-08-18 16:24:05 -0700
committerGravatar Tim Emiola <tbetbetbe@users.noreply.github.com>2015-08-18 16:24:05 -0700
commit0137ae35612e9f3a8849b92cb6a9bd27cb64d33b (patch)
treeb43b482b417598f8324b7bebade391a3006ed323
parent7ff63f6abad6c49a7b88b036c54075a03433457c (diff)
parentaac8f141cba18e9dc3b565085673fcc2dae4fe24 (diff)
Merge pull request #2958 from murgatroid99/node_deadline_internal
Made deadline tests accept INTERNAL status
-rw-r--r--src/node/interop/interop_client.js4
-rw-r--r--src/node/test/surface_test.js6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/node/interop/interop_client.js b/src/node/interop/interop_client.js
index 6d6f9a349e..612dcf01f6 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 52515cc8e7..ec7ed87728 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();
});
};