1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: improve test-tcp-wrap-listen

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/12599
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
alohaglenn 2017-04-22 13:11:03 -07:00 committed by Anna Henningsen
parent 3d87eca1e5
commit 7c238be1e1
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/parallel/test-tcp-wrap-listen.js
View File

@ -15,12 +15,6 @@ port = port.port;
server.listen(128); server.listen(128);
let sliceCount = 0;
let eofCount = 0;
let writeCount = 0;
let recvCount = 0;
server.onconnection = (err, client) => { server.onconnection = (err, client) => {
assert.strictEqual(0, client.writeQueueSize); assert.strictEqual(0, client.writeQueueSize);
console.log('got connection'); console.log('got connection');
@ -34,7 +28,7 @@ server.onconnection = (err, client) => {
client.readStart(); client.readStart();
client.pendingWrites = []; client.pendingWrites = [];
client.onread = (err, buffer) => { client.onread = common.mustCall((err, buffer) => {
if (buffer) { if (buffer) {
assert.ok(buffer.length > 0); assert.ok(buffer.length > 0);
@ -51,7 +45,7 @@ server.onconnection = (err, client) => {
assert.strictEqual(0, client.writeQueueSize); assert.strictEqual(0, client.writeQueueSize);
if (req.async) if (req.async)
req.oncomplete = done; req.oncomplete = common.mustCall(done);
else else
process.nextTick(done.bind(null, 0, client, req)); process.nextTick(done.bind(null, 0, client, req));
@ -66,20 +60,16 @@ server.onconnection = (err, client) => {
console.log('client.writeQueueSize: ' + client.writeQueueSize); console.log('client.writeQueueSize: ' + client.writeQueueSize);
assert.strictEqual(0, client.writeQueueSize); assert.strictEqual(0, client.writeQueueSize);
writeCount++;
console.log('write ' + writeCount);
maybeCloseClient(); maybeCloseClient();
} }
sliceCount++;
} else { } else {
console.log('eof'); console.log('eof');
client.gotEOF = true; client.gotEOF = true;
server.close(); server.close();
eofCount++;
maybeCloseClient(); maybeCloseClient();
} }
}; }, 2);
}; };
const net = require('net'); const net = require('net');
@ -89,18 +79,10 @@ const c = net.createConnection(port);
c.on('connect', common.mustCall(() => { c.end('hello world'); })); c.on('connect', common.mustCall(() => { c.end('hello world'); }));
c.setEncoding('utf8'); c.setEncoding('utf8');
c.on('data', (d) => { c.on('data', common.mustCall((d) => {
assert.strictEqual('hello world', d); assert.strictEqual('hello world', d);
recvCount++; }));
});
c.on('close', () => { c.on('close', () => {
console.error('client closed'); console.error('client closed');
}); });
process.on('exit', () => {
assert.strictEqual(1, sliceCount);
assert.strictEqual(1, eofCount);
assert.strictEqual(1, writeCount);
assert.strictEqual(1, recvCount);
});