Skip to content

Commit

Permalink
test: improve test-tcp-wrap-listen
Browse files Browse the repository at this point in the history
PR-URL: #12599
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information
QueueHefner authored and evanlucas committed May 2, 2017
1 parent 7fa1a4b commit 70e45ea
Showing 1 changed file with 5 additions and 23 deletions.
28 changes: 5 additions & 23 deletions test/parallel/test-tcp-wrap-listen.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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);

Expand All @@ -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));

Expand All @@ -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');
Expand All @@ -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);
});

0 comments on commit 70e45ea

Please sign in to comment.