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

test: allow out-of-order replies in dgram tests

Browse Source 
Allow out of order replies in the flaky
`test-dgram{-upd6,}-send-default-host.js` files by sorting
the incoming replies after receiving them.

PR-URL: https://github.com/nodejs/node/pull/6607
Fixes: https://github.com/nodejs/node/issues/6577
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This commit is contained in:
Anna Henningsen 2016-05-10 07:56:52 +02:00
parent 7f1111b1bb
commit aa34b43909
No known key found for this signature in database
GPG Key ID: D8B9F5AEAE84E4CF
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/parallel/test-dgram-send-default-host.js
View File

@ -11,20 +11,26 @@ const toSend = [Buffer.alloc(256, 'x'),
Buffer.alloc(256, 'z'), Buffer.alloc(256, 'z'),
'hello']; 'hello'];
client.on('listening', function() { const received = [];
client.on('listening', common.mustCall(() => {
client.send(toSend[0], 0, toSend[0].length, common.PORT); client.send(toSend[0], 0, toSend[0].length, common.PORT);
client.send(toSend[1], common.PORT); client.send(toSend[1], common.PORT);
client.send([toSend[2]], common.PORT); client.send([toSend[2]], common.PORT);
client.send(toSend[3], 0, toSend[3].length, common.PORT); client.send(toSend[3], 0, toSend[3].length, common.PORT);
}); }));
client.on('message', function(buf, info) { client.on('message', common.mustCall((buf, info) => {
const expected = toSend.shift().toString(); received.push(buf.toString());
assert.ok(buf.toString() === expected, 'message was received correctly');
if (toSend.length === 0) { if (received.length === toSend.length) {
// The replies may arrive out of order -> sort them before checking.
received.sort();
const expected = toSend.map(String).sort();
assert.deepStrictEqual(received, expected);
client.close(); client.close();
} }
}); }, toSend.length));
client.bind(common.PORT); client.bind(common.PORT);

27
test/parallel/test-dgram-udp6-send-default-host.js
View File

@ -11,26 +11,31 @@ if (!common.hasIPv6) {
const client = dgram.createSocket('udp6'); const client = dgram.createSocket('udp6');
const toSend = [new Buffer(256), new Buffer(256), new Buffer(256), 'hello']; const toSend = [Buffer.alloc(256, 'x'),
Buffer.alloc(256, 'y'),
Buffer.alloc(256, 'z'),
'hello'];
toSend[0].fill('x'); const received = [];
toSend[1].fill('y');
toSend[2].fill('z');
client.on('listening', function() { client.on('listening', common.mustCall(() => {
client.send(toSend[0], 0, toSend[0].length, common.PORT); client.send(toSend[0], 0, toSend[0].length, common.PORT);
client.send(toSend[1], common.PORT); client.send(toSend[1], common.PORT);
client.send([toSend[2]], common.PORT); client.send([toSend[2]], common.PORT);
client.send(toSend[3], 0, toSend[3].length, common.PORT); client.send(toSend[3], 0, toSend[3].length, common.PORT);
}); }));
client.on('message', function(buf, info) { client.on('message', common.mustCall((buf, info) => {
const expected = toSend.shift().toString(); received.push(buf.toString());
assert.ok(buf.toString() === expected, 'message was received correctly');
if (toSend.length === 0) { if (received.length === toSend.length) {
// The replies may arrive out of order -> sort them before checking.
received.sort();
const expected = toSend.map(String).sort();
assert.deepStrictEqual(received, expected);
client.close(); client.close();
} }
}); }, toSend.length));
client.bind(common.PORT); client.bind(common.PORT);