Skip to content

Commit

Permalink
test: refactor test-dgram-udp4
Browse files Browse the repository at this point in the history
This test was sometimes timing out in `OS X`. Remove the timeout and
clean up the code.

Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: James M Snell <[email protected]>
PR-URL: #5339
  • Loading branch information
santigimeno authored and rvagg committed Feb 27, 2016
1 parent 00660f5 commit 2c21d34
Showing 1 changed file with 14 additions and 42 deletions.
56 changes: 14 additions & 42 deletions test/parallel/test-dgram-udp4.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,29 @@ const assert = require('assert');
const dgram = require('dgram');
const server_port = common.PORT;
const message_to_send = 'A message to send';
let client;
let timer;

const server = dgram.createSocket('udp4');
server.on('message', function(msg, rinfo) {
console.log('server got: ' + msg +
' from ' + rinfo.address + ':' + rinfo.port);
server.on('message', common.mustCall((msg, rinfo) => {
assert.strictEqual(rinfo.address, common.localhostIPv4);
assert.strictEqual(msg.toString(), message_to_send.toString());
server.send(msg, 0, msg.length, rinfo.port, rinfo.address);
});
server.on('listening', function() {
var address = server.address();
console.log('server is listening on ' + address.address + ':' + address.port);
client = dgram.createSocket('udp4');
client.on('message', function(msg, rinfo) {
console.log('client got: ' + msg +
' from ' + rinfo.address + ':' + address.port);
}));
server.on('listening', common.mustCall(() => {
const client = dgram.createSocket('udp4');
client.on('message', common.mustCall((msg, rinfo) => {
assert.strictEqual(rinfo.address, common.localhostIPv4);
assert.strictEqual(rinfo.port, server_port);
assert.strictEqual(msg.toString(), message_to_send.toString());
client.close();
server.close();
});
client.send(
message_to_send,
0,
message_to_send.length,
server_port,
'localhost',
function(err) {
if (err) {
console.log('Caught error in client send.');
throw err;
}
}
);
client.on('close',
function() {
if (server.fd === null) {
clearTimeout(timer);
}
});
});
server.on('close', function() {
if (client.fd === null) {
clearTimeout(timer);
}
});
}));
client.send(message_to_send,
0,
message_to_send.length,
server_port,
'localhost');
client.on('close', common.mustCall(() => {}));
}));
server.on('close', common.mustCall(() => {}));
server.bind(server_port);

timer = setTimeout(function() {
throw new Error('Timeout');
}, common.platformTimeout(200));

0 comments on commit 2c21d34

Please sign in to comment.