test: fix flaky test-http-client-timeout-with-data
test-http-client-timeout-with-data has failed here and there in CI on FreeBSD and OS X. The test has a socket timeout set to 50ms and a timer set for 100ms. However, they are not necessarily set in the same tick of the event loop and their ordering is therefore not guaranteed. Instead of using a timer, this change listens for an event on the listener to know when the socket timeout has occurred and then runs the code originally in the timer. Additional refactoring: Replaced `process.on('exit', ...)` checks with `common.mustCall()` and replaced usage of `assert.equal()` with `assert.strictEqual()`. PR-URL: https://github.com/nodejs/node/pull/10431 Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
abc1633de6
commit
0b33ef80f1
@ -3,14 +3,8 @@ const common = require('../common');
|
|||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const http = require('http');
|
const http = require('http');
|
||||||
|
|
||||||
var ntimeouts = 0;
|
|
||||||
var nchunks = 0;
|
var nchunks = 0;
|
||||||
|
|
||||||
process.on('exit', function() {
|
|
||||||
assert.equal(ntimeouts, 1);
|
|
||||||
assert.equal(nchunks, 2);
|
|
||||||
});
|
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
port: undefined,
|
port: undefined,
|
||||||
@ -21,7 +15,7 @@ const options = {
|
|||||||
const server = http.createServer(function(req, res) {
|
const server = http.createServer(function(req, res) {
|
||||||
res.writeHead(200, {'Content-Length': '2'});
|
res.writeHead(200, {'Content-Length': '2'});
|
||||||
res.write('*');
|
res.write('*');
|
||||||
setTimeout(function() { res.end('*'); }, common.platformTimeout(100));
|
server.once('timeout', common.mustCall(function() { res.end('*'); }));
|
||||||
});
|
});
|
||||||
|
|
||||||
server.listen(0, options.host, function() {
|
server.listen(0, options.host, function() {
|
||||||
@ -30,19 +24,19 @@ server.listen(0, options.host, function() {
|
|||||||
req.end();
|
req.end();
|
||||||
|
|
||||||
function onresponse(res) {
|
function onresponse(res) {
|
||||||
req.setTimeout(50, function() {
|
req.setTimeout(50, common.mustCall(function() {
|
||||||
assert.equal(nchunks, 1); // should have received the first chunk by now
|
assert.strictEqual(nchunks, 1); // should have received the first chunk
|
||||||
ntimeouts++;
|
server.emit('timeout');
|
||||||
});
|
}));
|
||||||
|
|
||||||
res.on('data', function(data) {
|
res.on('data', common.mustCall(function(data) {
|
||||||
assert.equal('' + data, '*');
|
assert.strictEqual('' + data, '*');
|
||||||
nchunks++;
|
nchunks++;
|
||||||
});
|
}, 2));
|
||||||
|
|
||||||
res.on('end', function() {
|
res.on('end', common.mustCall(function() {
|
||||||
assert.equal(nchunks, 2);
|
assert.strictEqual(nchunks, 2);
|
||||||
server.close();
|
server.close();
|
||||||
});
|
}));
|
||||||
}
|
}
|
||||||
});
|
});
|
Loading…
x
Reference in New Issue
Block a user