Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7caf87b

Browse filesBrowse files
TrottMyles Borins
authored andcommitted
test: fix flaky test-http-agent-keepalive
Remove timeout delay causing flakiness on SmartOS. Fixes: #4492 PR-URL: #4524 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
1 parent 25c41d0 commit 7caf87b
Copy full SHA for 7caf87b

File tree

Expand file treeCollapse file tree

1 file changed

+15
-15
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+15
-15
lines changed
Open diff view settings
Collapse file

‎test/parallel/test-http-agent-keepalive.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-http-agent-keepalive.js
+15-15Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
'use strict';
2-
var common = require('../common');
3-
var assert = require('assert');
4-
var http = require('http');
5-
var Agent = require('_http_agent').Agent;
6-
var EventEmitter = require('events').EventEmitter;
2+
const common = require('../common');
3+
const assert = require('assert');
4+
const http = require('http');
5+
const Agent = require('_http_agent').Agent;
6+
const EventEmitter = require('events').EventEmitter;
77

8-
var agent = new Agent({
8+
const agent = new Agent({
99
keepAlive: true,
1010
keepAliveMsecs: 1000,
1111
maxSockets: 5,
1212
maxFreeSockets: 5
1313
});
1414

15-
var server = http.createServer(function(req, res) {
15+
const server = http.createServer(function(req, res) {
1616
if (req.url === '/error') {
1717
res.destroy();
1818
return;
1919
} else if (req.url === '/remote_close') {
20-
// cache the socket, close it after 100ms
21-
var socket = res.connection;
22-
setTimeout(function() {
20+
// cache the socket, close it after a short delay
21+
const socket = res.connection;
22+
setImmediate(function() {
2323
socket.end();
24-
}, 100);
24+
});
2525
}
2626
res.end('hello world');
2727
});
@@ -35,7 +35,7 @@ function get(path, callback) {
3535
}, callback);
3636
}
3737

38-
var name = 'localhost:' + common.PORT + ':';
38+
const name = 'localhost:' + common.PORT + ':';
3939

4040
function checkDataAndSockets(body) {
4141
assert.equal(body.toString(), 'hello world');
@@ -77,15 +77,15 @@ function remoteClose() {
7777
assert.equal(agent.freeSockets[name], undefined,
7878
'freeSockets is not empty');
7979
remoteError();
80-
}, 200);
80+
}, common.platformTimeout(200));
8181
});
8282
});
8383
});
8484
}
8585

8686
function remoteError() {
8787
// remove server will destroy ths socket
88-
var req = get('/error', function(res) {
88+
const req = get('/error', function(res) {
8989
throw new Error('should not call this function');
9090
});
9191
req.on('error', function(err) {
@@ -98,7 +98,7 @@ function remoteError() {
9898
assert.equal(agent.sockets[name], undefined);
9999
assert.equal(agent.freeSockets[name], undefined);
100100
done();
101-
}, 1);
101+
}, common.platformTimeout(1));
102102
});
103103
}
104104

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.