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

test: refactor test-dgram-udp4

Browse Source 
This test was sometimes timing out in `OS X`. Remove the timeout and
clean up the code.

Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/5339
This commit is contained in:
Santiago Gimeno 2016-02-20 17:36:35 +01:00 committed by Matteo Collina
parent 2426b3dd86
commit dff01d10c5
1 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/parallel/test-dgram-udp4.js
View File

@ -4,57 +4,29 @@ const assert = require('assert');
const dgram = require('dgram'); const dgram = require('dgram');
const server_port = common.PORT; const server_port = common.PORT;
const message_to_send = 'A message to send'; const message_to_send = 'A message to send';
let client;
let timer;
const server = dgram.createSocket('udp4'); const server = dgram.createSocket('udp4');
server.on('message', function(msg, rinfo) { server.on('message', common.mustCall((msg, rinfo) => {
console.log('server got: ' + msg +
' from ' + rinfo.address + ':' + rinfo.port);
assert.strictEqual(rinfo.address, common.localhostIPv4); assert.strictEqual(rinfo.address, common.localhostIPv4);
assert.strictEqual(msg.toString(), message_to_send.toString()); assert.strictEqual(msg.toString(), message_to_send.toString());
server.send(msg, 0, msg.length, rinfo.port, rinfo.address); server.send(msg, 0, msg.length, rinfo.port, rinfo.address);
}); }));
server.on('listening', function() { server.on('listening', common.mustCall(() => {
var address = server.address(); const client = dgram.createSocket('udp4');
console.log('server is listening on ' + address.address + ':' + address.port); client.on('message', common.mustCall((msg, rinfo) => {
client = dgram.createSocket('udp4');
client.on('message', function(msg, rinfo) {
console.log('client got: ' + msg +
' from ' + rinfo.address + ':' + address.port);
assert.strictEqual(rinfo.address, common.localhostIPv4); assert.strictEqual(rinfo.address, common.localhostIPv4);
assert.strictEqual(rinfo.port, server_port); assert.strictEqual(rinfo.port, server_port);
assert.strictEqual(msg.toString(), message_to_send.toString()); assert.strictEqual(msg.toString(), message_to_send.toString());
client.close(); client.close();
server.close(); server.close();
}); }));
client.send( client.send(message_to_send,
message_to_send,
0, 0,
message_to_send.length, message_to_send.length,
server_port, server_port,
'localhost', 'localhost');
function(err) { client.on('close', common.mustCall(() => {}));
if (err) { }));
console.log('Caught error in client send.'); server.on('close', common.mustCall(() => {}));
throw err;
}
}
);
client.on('close',
function() {
if (server.fd === null) {
clearTimeout(timer);
}
});
});
server.on('close', function() {
if (client.fd === null) {
clearTimeout(timer);
}
});
server.bind(server_port); server.bind(server_port);
timer = setTimeout(function() {
throw new Error('Timeout');
}, common.platformTimeout(200));