diff options
author | alohaglenn <glenngonda@gmail.com> | 2017-04-22 13:11:03 -0700 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2017-04-29 17:36:54 +0200 |
commit | 7c238be1e1fd2233e06e79b0bf37414978a197c2 (patch) | |
tree | b9aa2f66055e683fc4fde049b8daf30af47101e5 /test | |
parent | 3d87eca1e5c573f6b3f29e263e6718b78054e5e5 (diff) | |
download | android-node-v8-7c238be1e1fd2233e06e79b0bf37414978a197c2.tar.gz android-node-v8-7c238be1e1fd2233e06e79b0bf37414978a197c2.tar.bz2 android-node-v8-7c238be1e1fd2233e06e79b0bf37414978a197c2.zip |
test: improve test-tcp-wrap-listen
PR-URL: https://github.com/nodejs/node/pull/12599
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'test')
-rw-r--r-- | test/parallel/test-tcp-wrap-listen.js | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/test/parallel/test-tcp-wrap-listen.js b/test/parallel/test-tcp-wrap-listen.js index 9b9f3a84f1..687d11a911 100644 --- a/test/parallel/test-tcp-wrap-listen.js +++ b/test/parallel/test-tcp-wrap-listen.js @@ -15,12 +15,6 @@ port = port.port; server.listen(128); -let sliceCount = 0; -let eofCount = 0; - -let writeCount = 0; -let recvCount = 0; - server.onconnection = (err, client) => { assert.strictEqual(0, client.writeQueueSize); console.log('got connection'); @@ -34,7 +28,7 @@ server.onconnection = (err, client) => { client.readStart(); client.pendingWrites = []; - client.onread = (err, buffer) => { + client.onread = common.mustCall((err, buffer) => { if (buffer) { assert.ok(buffer.length > 0); @@ -51,7 +45,7 @@ server.onconnection = (err, client) => { assert.strictEqual(0, client.writeQueueSize); if (req.async) - req.oncomplete = done; + req.oncomplete = common.mustCall(done); else process.nextTick(done.bind(null, 0, client, req)); @@ -66,20 +60,16 @@ server.onconnection = (err, client) => { console.log('client.writeQueueSize: ' + client.writeQueueSize); assert.strictEqual(0, client.writeQueueSize); - writeCount++; - console.log('write ' + writeCount); maybeCloseClient(); } - sliceCount++; } else { console.log('eof'); client.gotEOF = true; server.close(); - eofCount++; maybeCloseClient(); } - }; + }, 2); }; const net = require('net'); @@ -89,18 +79,10 @@ const c = net.createConnection(port); c.on('connect', common.mustCall(() => { c.end('hello world'); })); c.setEncoding('utf8'); -c.on('data', (d) => { +c.on('data', common.mustCall((d) => { assert.strictEqual('hello world', d); - recvCount++; -}); +})); c.on('close', () => { console.error('client closed'); }); - -process.on('exit', () => { - assert.strictEqual(1, sliceCount); - assert.strictEqual(1, eofCount); - assert.strictEqual(1, writeCount); - assert.strictEqual(1, recvCount); -}); |