From ce05b70595be0639dd93f11913916907c43a6af7 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 26 Oct 2016 20:56:08 -0700 Subject: [PATCH] test: fix freebsd10-64 CI failures Remove unneeded timers from some tests and move others from parallel testing to sequential testing. This is to resolve test failures on freebsd10-64 on CI. The failures are all due to timers firing later than expected. Timers firing later than they are set for can happen on resource-constrained hosts and is not a bug. In general, it may be wise to put tests that depend on timing into sequential testing rather than parallel testing, as the timing can be affected by other simultaneously-running test processes. Fixes: https://github.com/nodejs/node/issues/8041 Fixes: https://github.com/nodejs/node/issues/9227 PR-URL: https://github.com/nodejs/node/pull/9317 Reviewed-By: Colin Ihrig Reviewed-By: Anna Henningsen Reviewed-By: Gibson Fahnestock Reviewed-By: Julien Gilli Reviewed-By: Johan Bergstrom Reviewed-By: Santiago Gimeno --- .../test-dgram-send-callback-multi-buffer.js | 5 ----- test/parallel/test-dgram-send-multi-buffer-copy.js | 5 ----- ...ls-server-failed-handshake-emits-clienterror.js | 14 +++----------- .../test-http-client-timeout-with-data.js | 0 .../test-http-server-consumed-timeout.js | 0 .../test-timers-blocking-callback.js | 0 .../test-timers-same-timeout-wrong-list-deleted.js | 0 7 files changed, 3 insertions(+), 21 deletions(-) rename test/{parallel => sequential}/test-http-client-timeout-with-data.js (100%) rename test/{parallel => sequential}/test-http-server-consumed-timeout.js (100%) rename test/{parallel => sequential}/test-timers-blocking-callback.js (100%) rename test/{parallel => sequential}/test-timers-same-timeout-wrong-list-deleted.js (100%) diff --git a/test/parallel/test-dgram-send-callback-multi-buffer.js b/test/parallel/test-dgram-send-callback-multi-buffer.js index 3004bfe39b8203..a60d42cc45d49e 100644 --- a/test/parallel/test-dgram-send-callback-multi-buffer.js +++ b/test/parallel/test-dgram-send-callback-multi-buffer.js @@ -6,13 +6,8 @@ const dgram = require('dgram'); const client = dgram.createSocket('udp4'); -const timer = setTimeout(function() { - throw new Error('Timeout'); -}, common.platformTimeout(200)); - const messageSent = common.mustCall(function messageSent(err, bytes) { assert.equal(bytes, buf1.length + buf2.length); - clearTimeout(timer); }); const buf1 = Buffer.alloc(256, 'x'); diff --git a/test/parallel/test-dgram-send-multi-buffer-copy.js b/test/parallel/test-dgram-send-multi-buffer-copy.js index 19222dac5fbd11..0b7f003335b545 100644 --- a/test/parallel/test-dgram-send-multi-buffer-copy.js +++ b/test/parallel/test-dgram-send-multi-buffer-copy.js @@ -6,13 +6,8 @@ const dgram = require('dgram'); const client = dgram.createSocket('udp4'); -const timer = setTimeout(function() { - throw new Error('Timeout'); -}, common.platformTimeout(200)); - const onMessage = common.mustCall(function(err, bytes) { assert.equal(bytes, buf1.length + buf2.length); - clearTimeout(timer); }); const buf1 = Buffer.alloc(256, 'x'); diff --git a/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js b/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js index a404dc904ba7b7..bd92dc28904183 100644 --- a/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js +++ b/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js @@ -11,7 +11,6 @@ const assert = require('assert'); const bonkers = Buffer.alloc(1024, 42); -let tlsClientErrorEmited = false; const server = tls.createServer({}) .listen(0, function() { @@ -19,19 +18,12 @@ const server = tls.createServer({}) c.write(bonkers); }); - }).on('tlsClientError', function(e) { - tlsClientErrorEmited = true; + }).on('tlsClientError', common.mustCall(function(e) { assert.ok(e instanceof Error, 'Instance of Error should be passed to error handler'); assert.ok(e.message.match( /SSL routines:SSL23_GET_CLIENT_HELLO:unknown protocol/), 'Expecting SSL unknown protocol'); - }); -setTimeout(function() { - server.close(); - - assert.ok(tlsClientErrorEmited, - 'tlsClientError should be emited'); - -}, common.platformTimeout(200)); + server.close(); + })); diff --git a/test/parallel/test-http-client-timeout-with-data.js b/test/sequential/test-http-client-timeout-with-data.js similarity index 100% rename from test/parallel/test-http-client-timeout-with-data.js rename to test/sequential/test-http-client-timeout-with-data.js diff --git a/test/parallel/test-http-server-consumed-timeout.js b/test/sequential/test-http-server-consumed-timeout.js similarity index 100% rename from test/parallel/test-http-server-consumed-timeout.js rename to test/sequential/test-http-server-consumed-timeout.js diff --git a/test/parallel/test-timers-blocking-callback.js b/test/sequential/test-timers-blocking-callback.js similarity index 100% rename from test/parallel/test-timers-blocking-callback.js rename to test/sequential/test-timers-blocking-callback.js diff --git a/test/parallel/test-timers-same-timeout-wrong-list-deleted.js b/test/sequential/test-timers-same-timeout-wrong-list-deleted.js similarity index 100% rename from test/parallel/test-timers-same-timeout-wrong-list-deleted.js rename to test/sequential/test-timers-same-timeout-wrong-list-deleted.js