summaryrefslogtreecommitdiff
path: root/test/parallel/test-tls-wrap-timeout.js
diff options
context:
space:
mode:
authorRoman Reiss <me@silverwind.io>2015-04-07 20:41:07 +0200
committerRoman Reiss <me@silverwind.io>2015-04-09 15:10:34 +0200
commit7049d7b4746dc5dae82d608ac12dc6e1cf11035e (patch)
treec567d2abd2cf2d152d14b120a397282bcce41c3f /test/parallel/test-tls-wrap-timeout.js
parentd2b62a49731b9204359b4d346ca0d017fa2c985f (diff)
downloadnode-new-7049d7b4746dc5dae82d608ac12dc6e1cf11035e.tar.gz
test: increase timeouts on ARM
This commit introduces platform-specific test timeouts for the ARM architectures. ARMv6 is notoriously slow so gets very large timeouts on both the timeout value for each test, as well as certain problematic individual tests. ARMv7 and ARMv8 also get slightly increased headroom. PR-URL: https://github.com/iojs/io.js/pull/1366 Fixes: https://github.com/iojs/io.js/issues/1343 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'test/parallel/test-tls-wrap-timeout.js')
-rw-r--r--test/parallel/test-tls-wrap-timeout.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/parallel/test-tls-wrap-timeout.js b/test/parallel/test-tls-wrap-timeout.js
index 7bb5bb1b0d..3013f68886 100644
--- a/test/parallel/test-tls-wrap-timeout.js
+++ b/test/parallel/test-tls-wrap-timeout.js
@@ -27,7 +27,9 @@ var server = tls.createServer(options, function(c) {
server.listen(common.PORT, function() {
var socket = net.connect(common.PORT, function() {
- socket.setTimeout(240, assert.fail);
+ socket.setTimeout(common.platformTimeout(240), function() {
+ throw new Error('timeout');
+ });
var tsocket = tls.connect({
socket: socket,