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

test: fix flaky test-http-set-timeout-server

Browse Source 
It can happen that the connection and server is closed before the second
reponse has been processed by server. In this case, the
`res.setTimeout()` callback will never be called causing the test to
fail. Fix this by only closing the connection and server when the 2nd
has been received.

PR-URL: https://github.com/nodejs/node/pull/11790
Fixes: https://github.com/nodejs/node/issues/11768
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
This commit is contained in:
Santiago Gimeno 2017-03-10 12:13:49 +01:00
parent 1d1dbcafa8
commit 3be1db8702
No known key found for this signature in database
GPG Key ID: F28C3C8DA33C03BE
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/parallel/test-http-set-timeout-server.js
View File

@ -138,10 +138,13 @@ test(function serverRequestNotTimeoutAfterEnd(cb) {
test(function serverResponseTimeoutWithPipeline(cb) { test(function serverResponseTimeoutWithPipeline(cb) {
let caughtTimeout = ''; let caughtTimeout = '';
let secReceived = false;
process.on('exit', function() { process.on('exit', function() {
assert.strictEqual(caughtTimeout, '/2'); assert.strictEqual(caughtTimeout, '/2');
}); });
const server = http.createServer(function(req, res) { const server = http.createServer(function(req, res) {
if (req.url === '/2')
secReceived = true;
const s = res.setTimeout(50, function() { const s = res.setTimeout(50, function() {
caughtTimeout += req.url; caughtTimeout += req.url;
}); });
@ -149,9 +152,11 @@ test(function serverResponseTimeoutWithPipeline(cb) {
if (req.url === '/1') res.end(); if (req.url === '/1') res.end();
}); });
server.on('timeout', function(socket) { server.on('timeout', function(socket) {
socket.destroy(); if (secReceived) {
server.close(); socket.destroy();
cb(); server.close();
cb();
}
}); });
server.listen(common.mustCall(function() { server.listen(common.mustCall(function() {
const port = server.address().port; const port = server.address().port;