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

test: fix flaky test-https-timeout

Browse Source 
Remove `setTimeout()` in test and instead rely on `common.mustCall()` on
a `timeout` event handler.

The test was flaky on CI. The flakiness was replicable by running the
test under load. This version, in contrast, is robust under load.

Took the opportunity to do some `var` -> `const` while refactoring.

PR-URL: https://github.com/nodejs/node/pull/10404
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Italo A. Casas <me@italoacasas.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2016-12-21 17:53:11 -08:00
parent 2bba2d21bd
commit 3f52ce35bc
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/parallel/test-https-timeout.js
View File

@ -1,24 +1,24 @@
'use strict';
var common = require('../common');
const common = require('../common');
if (!common.hasCrypto) {
common.skip('missing crypto');
return;
}
var https = require('https');
const https = require('https');
var fs = require('fs');
const fs = require('fs');
var options = {
const options = {
key: fs.readFileSync(common.fixturesDir + '/keys/agent1-key.pem'),
cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem')
};
// a server that never replies
var server = https.createServer(options, function() {
const server = https.createServer(options, function() {
console.log('Got request. Doing nothing.');
}).listen(0, function() {
var req = https.request({
}).listen(0, common.mustCall(function() {
const req = https.request({
host: 'localhost',
port: this.address().port,
path: '/',
@ -28,26 +28,14 @@ var server = https.createServer(options, function() {
req.setTimeout(10);
req.end();
req.on('response', function(res) {
req.on('response', function() {
console.log('got response');
});
req.on('socket', function() {
console.log('got a socket');
req.socket.on('connect', function() {
console.log('socket connected');
});
setTimeout(function() {
throw new Error('Did not get timeout event');
}, 200);
});
req.on('timeout', function() {
req.on('timeout', common.mustCall(function() {
console.log('timeout occurred outside');
req.destroy();
server.close();
process.exit(0);
});
});
}));
}));