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

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

Browse Source 
Because of a race condition, connection listener may not be invoked if
test is run under load. Remove `common.mustCall()` wrapper from the
listener. Move the test to `parallel` because it now works under load.
Make similar change to http test to keep them in synch even though it is
much harder to trigger the race in http.

PR-URL: https://github.com/nodejs/node/pull/14134
Fixes: https://github.com/nodejs/node/issues/14133
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
This commit is contained in:
Rich Trott 2017-07-08 09:05:34 -07:00
parent 22889347df
commit b20a0b662b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,10 @@ function run() {
} }
test(function serverTimeout(cb) { test(function serverTimeout(cb) {
const server = http.createServer(common.mustCall((req, res) => { const server = http.createServer((req, res) => {
// just do nothing, we should get a timeout event. // Do nothing. We should get a timeout event.
})); // Might not be invoked. Do not wrap in common.mustCall().
});
server.listen(common.mustCall(() => { server.listen(common.mustCall(() => {
const s = server.setTimeout(50, common.mustCall((socket) => { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();

7
test/sequential/test-https-set-timeout-server.js → test/parallel/test-https-set-timeout-server.js
View File

@ -54,9 +54,10 @@ function run() {
test(function serverTimeout(cb) { test(function serverTimeout(cb) {
const server = https.createServer( const server = https.createServer(
serverOptions, serverOptions,
common.mustCall((req, res) => { (req, res) => {
// just do nothing, we should get a timeout event. // Do nothing. We should get a timeout event.
})); // Might not be invoked. Do not wrap in common.mustCall().
});
server.listen(common.mustCall(() => { server.listen(common.mustCall(() => {
const s = server.setTimeout(50, common.mustCall((socket) => { const s = server.setTimeout(50, common.mustCall((socket) => {
socket.destroy(); socket.destroy();