summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2016-10-26 20:56:08 -0700
committerRich Trott <rtrott@gmail.com>2016-10-29 13:11:01 -0700
commit6ef636c0c93e249f9da8bf060dc537667b9d3595 (patch)
tree93a4f9fb938aadc3e07ad859887fe331a1a036a1
parentec7c27f4cb80c3f2600ec7e024276c2831273a47 (diff)
downloadandroid-node-v8-6ef636c0c93e249f9da8bf060dc537667b9d3595.tar.gz
android-node-v8-6ef636c0c93e249f9da8bf060dc537667b9d3595.tar.bz2
android-node-v8-6ef636c0c93e249f9da8bf060dc537667b9d3595.zip
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 <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Julien Gilli <jgilli@nodejs.org> Reviewed-By: Johan Bergstrom <bugs@bergstroem.nu> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
-rw-r--r--test/parallel/test-dgram-send-callback-multi-buffer.js5
-rw-r--r--test/parallel/test-dgram-send-multi-buffer-copy.js5
-rw-r--r--test/parallel/test-tls-server-failed-handshake-emits-clienterror.js14
-rw-r--r--test/sequential/test-http-client-timeout-with-data.js (renamed from test/parallel/test-http-client-timeout-with-data.js)0
-rw-r--r--test/sequential/test-http-server-consumed-timeout.js (renamed from test/parallel/test-http-server-consumed-timeout.js)0
-rw-r--r--test/sequential/test-timers-blocking-callback.js (renamed from test/parallel/test-timers-blocking-callback.js)0
-rw-r--r--test/sequential/test-timers-same-timeout-wrong-list-deleted.js (renamed from test/parallel/test-timers-same-timeout-wrong-list-deleted.js)0
7 files changed, 3 insertions, 21 deletions
diff --git a/test/parallel/test-dgram-send-callback-multi-buffer.js b/test/parallel/test-dgram-send-callback-multi-buffer.js
index 3004bfe39b..a60d42cc45 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 19222dac5f..0b7f003335 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 a404dc904b..bd92dc2890 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
index f5b2a60dc5..f5b2a60dc5 100644
--- a/test/parallel/test-http-client-timeout-with-data.js
+++ b/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
index 799992e2c4..799992e2c4 100644
--- a/test/parallel/test-http-server-consumed-timeout.js
+++ b/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
index e4e85cddc6..e4e85cddc6 100644
--- a/test/parallel/test-timers-blocking-callback.js
+++ b/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
index 05c0233e12..05c0233e12 100644
--- a/test/parallel/test-timers-same-timeout-wrong-list-deleted.js
+++ b/test/sequential/test-timers-same-timeout-wrong-list-deleted.js