diff options
author | 2015-01-21 17:12:04 -0800 | |
---|---|---|
committer | 2015-01-21 17:12:04 -0800 | |
commit | 48c9c4a59e97ea3622bb1d9dc4e6e91a63c4f7f8 (patch) | |
tree | 12d1b51db0dd88a1b7ead48fe59c6bb85ff9ce8a /src/node/test/server_test.js | |
parent | 9ef3d04bfff61041ad5b9df7883fb3e30f205c65 (diff) | |
parent | 702b5b425f8f7071d0ca8480fbb72b523de72ab3 (diff) |
Resolved merge conflicts with master
Diffstat (limited to 'src/node/test/server_test.js')
-rw-r--r-- | src/node/test/server_test.js | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/src/node/test/server_test.js b/src/node/test/server_test.js index 61aef4677e..457d13d2f5 100644 --- a/src/node/test/server_test.js +++ b/src/node/test/server_test.js @@ -81,28 +81,7 @@ describe('echo server', function() { var call = new grpc.Call(channel, 'echo', deadline); - call.startInvoke(function(event) { - assert.strictEqual(event.type, - grpc.completionType.INVOKE_ACCEPTED); - call.startWrite( - new Buffer(req_text), - function(event) { - assert.strictEqual(event.type, - grpc.completionType.WRITE_ACCEPTED); - assert.strictEqual(event.data, grpc.opError.OK); - call.writesDone(function(event) { - assert.strictEqual(event.type, - grpc.completionType.FINISH_ACCEPTED); - assert.strictEqual(event.data, grpc.opError.OK); - done(); - }); - }, 0); - call.startRead(function(event) { - assert.strictEqual(event.type, grpc.completionType.READ); - assert.strictEqual(event.data.toString(), req_text); - done(); - }); - },function(event) { + call.invoke(function(event) { assert.strictEqual(event.type, grpc.completionType.CLIENT_METADATA_READ); done(); @@ -114,5 +93,23 @@ describe('echo server', function() { server.shutdown(); done(); }, 0); + call.startWrite( + new Buffer(req_text), + function(event) { + assert.strictEqual(event.type, + grpc.completionType.WRITE_ACCEPTED); + assert.strictEqual(event.data, grpc.opError.OK); + call.writesDone(function(event) { + assert.strictEqual(event.type, + grpc.completionType.FINISH_ACCEPTED); + assert.strictEqual(event.data, grpc.opError.OK); + done(); + }); + }, 0); + call.startRead(function(event) { + assert.strictEqual(event.type, grpc.completionType.READ); + assert.strictEqual(event.data.toString(), req_text); + done(); + }); }); }); |