diff --git a/test/parallel/test-dgram-udp4.js b/test/parallel/test-dgram-udp4.js index b36034f75d..792aabb8c8 100644 --- a/test/parallel/test-dgram-udp4.js +++ b/test/parallel/test-dgram-udp4.js @@ -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));