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

test: fix race in test-net-server-pause-on-connect

Browse Source 
A 50ms timeout results in a race condition. Instead, enforce expected
order through callbacks. This has the side effect of speeding up the
test in most situations.

Ref: https://github.com/nodejs/node/pull/4476
PR-URL: https://github.com/nodejs/node/pull/4637
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2016-01-11 18:00:53 -08:00 committed by James M Snell
parent d139704ff7
commit e22cc6c2eb
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/parallel/test-net-server-pause-on-connect.js
View File

@ -1,13 +1,16 @@
'use strict'; 'use strict';
var common = require('../common'); const common = require('../common');
var assert = require('assert'); const assert = require('assert');
var net = require('net'); const net = require('net');
var msg = 'test'; const msg = 'test';
var stopped = true; var stopped = true;
var server1 = net.createServer({pauseOnConnect: true}, function(socket) { var server1Sock;
const server1ConnHandler = function(socket) {
socket.on('data', function(data) { socket.on('data', function(data) {
if (stopped) { if (stopped) {
assert(false, 'data event should not have happened yet'); common.fail('data event should not have happened yet');
} }
assert.equal(data.toString(), msg, 'invalid data received'); assert.equal(data.toString(), msg, 'invalid data received');
@ -15,38 +18,34 @@ var server1 = net.createServer({pauseOnConnect: true}, function(socket) {
server1.close(); server1.close();
}); });
setTimeout(function() { server1Sock = socket;
// After 50(ish) ms, the other socket should have already read the data. };
assert.equal(read, true);
assert.equal(socket.bytesRead, 0, 'no data should have been read yet');
socket.resume(); const server1 = net.createServer({pauseOnConnect: true}, server1ConnHandler);
stopped = false;
}, common.platformTimeout(50));
});
// read is a timing check, as server1's timer should fire after server2's const server2ConnHandler = function(socket) {
// connection receives the data. Note that this could be race-y.
var read = false;
var server2 = net.createServer({pauseOnConnect: false}, function(socket) {
socket.on('data', function(data) { socket.on('data', function(data) {
read = true;
assert.equal(data.toString(), msg, 'invalid data received'); assert.equal(data.toString(), msg, 'invalid data received');
socket.end(); socket.end();
server2.close(); server2.close();
assert.equal(server1Sock.bytesRead, 0, 'no data should have been read yet');
server1Sock.resume();
stopped = false;
}); });
}); };
const server2 = net.createServer({pauseOnConnect: false}, server2ConnHandler);
server1.listen(common.PORT, function() { server1.listen(common.PORT, function() {
net.createConnection({port: common.PORT}).write(msg); const clientHandler = common.mustCall(function() {
});
server2.listen(common.PORT + 1, function() { server2.listen(common.PORT + 1, function() {
net.createConnection({port: common.PORT + 1}).write(msg); net.createConnection({port: common.PORT + 1}).write(msg);
}); });
});
net.createConnection({port: common.PORT}).write(msg, clientHandler);
});
process.on('exit', function() { process.on('exit', function() {
assert.equal(stopped, false); assert.equal(stopped, false);
assert.equal(read, true);
}); });